Skip to content

Commit

Permalink
phpcs fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
raffis committed Feb 2, 2018
1 parent 15a87ca commit 23e1bae
Show file tree
Hide file tree
Showing 8 changed files with 232 additions and 248 deletions.
19 changes: 4 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@ PHPSTAN_LOCK = $(BASE_DIR)/.phpstan.lock

# TARGET ALIASES
COMPOSER_TARGET = $(COMPOSER_LOCK)
PHPCS_FIX_TARGET = $(PHPCS_FIXER_LOCK)
PHPCS_CHECK_TARGET = $(PHPCS_FIXER_LOCK)
PHPUNIT_TARGET = $(PHPUNIT_LOCK)
PHPSTAN_TARGET = $(PHPSTAN_LOCK)
BUILD_TARGET = $(COMPOSER_TARGET) $(PHPUNIT_TARGET) $(PHPSTAN_TARGET) $(PHPCS_FIXER_TARGET)
BUILD_TARGET = $(COMPOSER_TARGET) $(PHPUNIT_TARGET) $(PHPSTAN_TARGET) $(PHPCS_CHECK_TARGET)

# MACROS
macro_find_phpfiles = $(shell find $(1) -type f -name "*.php")
Expand Down Expand Up @@ -61,23 +60,13 @@ $(COMPOSER_TARGET) $(PHPCS_FIXER_SCRIPT) $(PHPUNIT_SCRIPT) $(PHPSTAN_SCRIPT): $(
$(COMPOSER_BIN) update
@touch $@


.PHONY: phpcs-check
phpcs-check: $(PHPCS_FIXER_TARGET)
.PHONY: phpcs
phpcs: $(PHPCS_CHECK_TARGET)

$(PHPCS_CHECK_TARGET): $(PHPCS_FIXER_SCRIPT) $(PHP_FILES) $(COMPOSER_LOCK)
$(PHP_BIN) $(PHPCS_FIXER_SCRIPT) fix --config=.php_cs.dist -v --dry-run --allow-risky --stop-on-violation --using-cache=no
@touch $@


.PHONY: phpcs-fix
phpcs-fix: $(PHPCS_FIXER_TARGET)

$(PHPCS_FIX_TARGET): $(PHPCS_FIXER_SCRIPT) $(PHP_FILES) $(COMPOSER_LOCK)
$(PHP_BIN) $(PHPCS_FIXER_SCRIPT) fix --config=.php_cs.dist -v
$(PHP_BIN) $(PHPCS_FIXER_SCRIPT) fix --config=.php_cs.dist -v --dry-run --allow-risky=yes --stop-on-violation --using-cache=no
@touch $@


.PHONY: test
test: $(PHPUNIT_TARGET)

Expand Down
7 changes: 4 additions & 3 deletions src/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
declare(strict_types=1);

/**
* balloon
* Micro
*
* @copyright Copryright (c) 2012-2018 gyselroth GmbH (https://gyselroth.com)
* @license GPL-3.0 https://opensource.org/licenses/GPL-3.0
* @author Raffael Sahli <[email protected]>
* @copyright Copryright (c) 2015-2017 gyselroth GmbH (https://gyselroth.com)
* @license MIT https://opensource.org/licenses/MIT
*/

namespace Micro\Http;
Expand Down
7 changes: 4 additions & 3 deletions src/Http.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
declare(strict_types=1);

/**
* balloon
* Micro
*
* @copyright Copryright (c) 2012-2018 gyselroth GmbH (https://gyselroth.com)
* @license GPL-3.0 https://opensource.org/licenses/GPL-3.0
* @author Raffael Sahli <[email protected]>
* @copyright Copryright (c) 2015-2017 gyselroth GmbH (https://gyselroth.com)
* @license MIT https://opensource.org/licenses/MIT
*/

namespace Micro\Http;
Expand Down
Loading

0 comments on commit 23e1bae

Please sign in to comment.