Skip to content

Commit

Permalink
Merge pull request #244 from j0k3r/update-deps-phpstan-level5
Browse files Browse the repository at this point in the history
Update some package
  • Loading branch information
j0k3r authored Apr 27, 2020
2 parents e1929e2 + 60eb25b commit 8bbdad8
Show file tree
Hide file tree
Showing 22 changed files with 538 additions and 298 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@
!/bin/console
!/bin/symfony_requirements
.php_cs.cache
.phpunit.result.cache
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
cache:
apt: true
directories:
- $HOME/.composer/cache
- $HOME/.composer/cache/files

matrix:
fast_finish: true
Expand All @@ -30,19 +30,20 @@ before_install:
- echo "extension=redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini

install:
- composer --prefer-dist install --no-interaction -o --no-progress
- composer install --no-interaction --optimize-autoloader --no-progress --prefer-dist --no-suggest
- php bin/simple-phpunit install

before_script:
- php bin/console doctrine:database:create --env=test
- php bin/console doctrine:schema:create --env=test
- php bin/console doctrine:fixtures:load --env=test -n
- ./bin/rabbit vhost:mapping:create -p guest app/config/rabbit_vhost.yml
- php bin/rabbit vhost:mapping:create -p guest app/config/rabbit_vhost.yml
- if [ "$COVERAGE" = "run" ]; then PHPUNIT_FLAGS="--coverage-clover build/logs/clover.xml"; fi;

script:
- ./bin/simple-phpunit -v $PHPUNIT_FLAGS
- php bin/simple-phpunit -v $PHPUNIT_FLAGS
- if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix --verbose --dry-run ; fi;
- if [ "$CS_FIXER" = "run" ]; then php bin/phpstan analyse src tests --no-progress --level 1 ; fi;
- if [ "$CS_FIXER" = "run" ]; then php bin/phpstan analyse src tests --no-progress --level 5 ; fi;

after_success:
- |
Expand Down
2 changes: 1 addition & 1 deletion app/AppKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function registerBundles()
$bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();

if ('dev' === $this->getEnvironment()) {
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
$bundles[] = new Symfony\Bundle\MakerBundle\MakerBundle();
$bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
}
}
Expand Down
11 changes: 5 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,19 @@
"ashleydawson/simple-pagination-bundle": "^3.0",
"cache/predis-adapter": "^1.0",
"doctrine/doctrine-bundle": "^1.12",
"doctrine/doctrine-cache-bundle": "^1.2",
"doctrine/doctrine-migrations-bundle": "^2.0",
"doctrine/orm": "^2.5",
"incenteev/composer-parameter-handler": "^2.0",
"knplabs/github-api": "^2.2",
"knplabs/knp-time-bundle": "^1.8",
"knpuniversity/oauth2-client-bundle": "^1.9",
"laminas/laminas-code": "^3.4",
"league/oauth2-github": "^2.0",
"marcw/rss-writer": "^0.4",
"ocramius/proxy-manager": "^2.1",
"odolbeau/rabbit-mq-admin-toolkit": "^4.0",
"php-amqplib/php-amqplib": "^2.6",
"php-http/cache-plugin": "^1.3",
"php-http/guzzle6-adapter": "^1.1",
"php-http/guzzle6-adapter": "^2.0",
"ramsey/uuid": "^4.0",
"sensio/distribution-bundle": "^5.0",
"sensio/framework-extra-bundle": "^5.0",
Expand All @@ -46,7 +45,7 @@
"symfony/monolog-bundle": "^3.0",
"symfony/polyfill-apcu": "^1.0",
"symfony/symfony": "3.4.*",
"twig/twig": "^1.0||^2.0"
"twig/twig": "^2.0||^3.0"
},
"require-dev": {
"doctrine/doctrine-fixtures-bundle": "^3.0",
Expand All @@ -57,8 +56,8 @@
"phpstan/phpstan-doctrine": "^0.11.0",
"phpstan/phpstan-phpunit": "^0.11.0",
"phpstan/phpstan-symfony": "^0.11.0",
"sensio/generator-bundle": "^3.0",
"symfony/phpunit-bridge": "~4.3.8"
"symfony/maker-bundle": "^1.15",
"symfony/phpunit-bridge": "~5.0"
},
"scripts": {
"symfony-scripts": [
Expand Down
Loading

0 comments on commit 8bbdad8

Please sign in to comment.