Skip to content

Commit

Permalink
Fix the MakeFile (#790)
Browse files Browse the repository at this point in the history
Fix the MakeFile rules to properly install the required dependencies
when running a command.

Updated PHP-CS-Fixer configuration to exclude the Symfony application
cache used for the bridge.

Applied PHP-CS-Fixer.
  • Loading branch information
theofidry committed Sep 14, 2017
1 parent 1051dfb commit 1370ac2
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 8 deletions.
1 change: 1 addition & 0 deletions .php_cs.dist
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ $finder = Finder::create()
])
->exclude([
__DIR__.'/fixtures/Parser/files/php',
__DIR__.'/Bridge/Symfony/Application/cache',
])
;

Expand Down
44 changes: 37 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ test: ## Run all the tests
test: tu ts

tu: ## Run the tests for the core library
tu: vendor
tu: vendor vendor-bin/covers-validator/vendor
$(COVERS_VALIDATOR)
$(PHPUNIT)

Expand All @@ -36,11 +36,11 @@ tc: dist/coverage
$(PHPDBG) --exclude-group=integration --coverage-text --coverage-html=dist/coverage

tm: ## Run the tests for mutation testing
tm: vendor
tm: vendor vendor-bin/humbug/vendor
$(HUMBUG)

tp: ## Run Blackfire performance tests
tp: vendor
tp: vendor vendor-bin/profiling/vendor
php profiling/scenario0/blackfire.php
php profiling/scenario1/blackfire.php
php profiling/scenario2/blackfire.php
Expand All @@ -53,7 +53,7 @@ tp: vendor
##---------------------------------------------------------------------------

phpstan: ## Run PHPStan analysis
phpstan: vendor
phpstan: vendor-bin/phpstan/vendor
$(PHPSTAN) analyze -c phpstan.neon -l4 src fixtures tests


Expand All @@ -62,7 +62,7 @@ phpstan: vendor
##---------------------------------------------------------------------------

cs: ## Run the CS Fixer
cs: .php_cs.cache
cs: .php_cs.cache vendor-bin/php-cs-fixer/vendor
$(PHP_CS_FIXER) fix


Expand All @@ -77,7 +77,37 @@ composer.lock: composer.json
@echo compose.lock is not up to date.

vendor-bin/symfony/vendor: vendor-bin/symfony/composer.lock
composer install
composer bin symfony install

vendor-bin/symfony/composer.lock: vendor-bin/symfony/composer.json
@echo compose.lock is not up to date.
@echo symfony compose.lock is not up to date.

vendor-bin/php-cs-fixer/vendor: vendor-bin/php-cs-fixer/composer.lock
composer bin php-cs-fixer install

vendor-bin/php-cs-fixer/composer.lock: vendor-bin/php-cs-fixer/composer.json
@echo php-cs-fixer composer.lock is not up to date.

vendor-bin/phpstan/vendor: vendor-bin/phpstan/composer.lock
composer bin phpstan install

vendor-bin/phpstan/composer.lock: vendor-bin/phpstan/composer.json
@echo phpstan composer.lock is not up to date

vendor-bin/profiling/vendor: vendor-bin/profiling/composer.lock
composer bin profiling install

vendor-bin/profiling/composer.lock: vendor-bin/profiling/composer.json
@echo profiling composer.lock is not up to date

vendor-bin/humbug/vendor: vendor-bin/humbug/composer.lock
composer bin humbug install

vendor-bin/humbug/composer.lock: vendor-bin/humbug/composer.json
@echo humbug composer.lock is not up to date

vendor-bin/covers-validator/vendor: vendor-bin/covers-validator/composer.lock
composer bin covers-validator install

vendor-bin/covers-validator/composer.lock: vendor-bin/covers-validator/composer.json
@echo covers-validator composer.lock is not up to date
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ public function unescape(string $value): string
{
return array_key_exists($value, $this->tokens) ? $this->tokens[$value] : $value;
}
}
}

0 comments on commit 1370ac2

Please sign in to comment.