CI: use build stages, added phpstan

contributte · Sep 26, 2017 · cc162ff · cc162ff
1 parent eb17e72
commit cc162ff
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 45 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,51 +1,60 @@
 language: php
-
 php:
-  - 5.6
-  - 7.0
-  - 7.1
-  - hhvm
-
-matrix:
-  fast_finish: true
+    - 5.6
+    - 7.0
+    - 7.1
+    - 7.2
 
-  allow_failures:
-      - php: hhvm
+before_install:
+  # turn off XDebug
+  - phpenv config-rm xdebug.ini || return 0
 
-  include:
-    - php: 5.6
-      env: COMPOSER_FLAG=--prefer-lowest
-    - php: 5.6
-      env: COMPOSER_FLAG=--prefer-stable
-    - php: 7.0
-      env: COMPOSER_FLAG=--prefer-lowest
-    - php: 7.0
-      env: COMPOSER_FLAG=--prefer-stable
-    - php: 7.1
-      env: COMPOSER_FLAG=--prefer-lowest
-    - php: 7.1
-      env: COMPOSER_FLAG=--prefer-stable
-
-before_script:
+install:
   # Composer
-  - travis_retry composer install --no-interaction
-  # Coverage
-  - if [[ "$TRAVIS_PHP_VERSION" == "7.1" && "$COMPOSER_FLAG" == "" ]]; then COVERAGE=1 CODESNIFFER=1; fi
+  - travis_retry composer install --no-progress --prefer-dist
 
 script:
-  # Nette\Tester
+  # Nette/Tester
   - composer run-script tester
 
-  # Quality Assurance
-  - if [ "$COVERAGE" != "" ]; then travis_retry composer qa; fi
+jobs:
+  include:
+    - env: title="Lowest Dependencies 5.6"
+      php: 5.6
+      install:
+        - travis_retry composer update --no-progress --prefer-dist --prefer-lowest
+      script:
+        - composer run-script tester
 
-  # Nette\Tester + CodeCoverage
-  - if [ "$COVERAGE" != "" ]; then composer tester-coverage; fi
+    - env: title="Lowest Dependencies 7.1"
+      php: 7.1
+      install:
+        - travis_retry composer update --no-progress --prefer-dist --prefer-lowest
+      script:
+        - composer run-script tester
 
-after_script:
-  # Coverage (Coveralls)
-  - if [ "$COVERAGE" != "" ]; then wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar; fi
-  - if [ "$COVERAGE" != "" ]; then php coveralls.phar --verbose --config tests/.coveralls.yml; fi
+    - stage: Quality Assurance
+      php: 7.1
+      script:
+        - composer run-script qa
+
+    - stage: Test Coverage
+      php: 7.1
+      script:
+        - composer run-script coverage
+      after_script:
+        - wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar
+        - php coveralls.phar --verbose --config tests/.coveralls.yml
+
+    - stage: Phpstan
+      php: 7.1
+      script:
+        - composer run-script phpstan-install
+        - composer run-script phpstan
+
+  allow_failures:
+    - stage: Test Coverage
+    - stage: Phpstan
 
 after_failure:
   # Print *.actual content

diff --git a/composer.json b/composer.json
@@ -16,12 +16,12 @@
     "contributte/psr7-http-message": "~0.3.0"
   },
   "require-dev": {
-    "ninjify/qa": "^0.4.0",
-    "ninjify/nunjuck": "^0.1.4",
-    "nette/di": "^2.4.9",
-    "nette/http": "^2.4.6",
-    "nette/application": "^2.4.8",
-    "tracy/tracy": "^2.4.8"
+    "ninjify/qa": "~0.4.0",
+    "ninjify/nunjuck": "~0.2.0",
+    "nette/di": "~2.4.10",
+    "nette/http": "~2.4.7",
+    "nette/application": "~2.4.9",
+    "tracy/tracy": "~2.4.9"
   },
   "suggest": {
     "tracy/tracy": "to use TracyMiddleware",
@@ -47,8 +47,16 @@
     "tester": [
       "tester -s -p php --colors 1 -c tests/php-unix.ini tests/cases"
     ],
-    "tester-coverage": [
+    "coverage": [
       "tester -s -p php --colors 1 -c tests/php-unix.ini -d extension=xdebug.so --coverage ./coverage.xml --coverage-src ./src tests/cases"
+    ],
+    "phpstan-install": [
+      "mkdir -p temp/phpstan",
+      "composer require -d temp/phpstan phpstan/phpstan:0.8.5",
+      "composer require -d temp/phpstan phpstan/phpstan-nette:0.8.3"
+    ],
+    "phpstan": [
+      "temp/phpstan/vendor/bin/phpstan analyse -l 1 -c phpstan.neon src"
     ]
   },
   "minimum-stability": "dev",

diff --git a/phpstan.neon b/phpstan.neon
@@ -0,0 +1,5 @@
+includes:
+	- temp/phpstan/vendor/phpstan/phpstan-nette/extension.neon
+	- temp/phpstan/vendor/phpstan/phpstan-nette/rules.neon
+
+parameters:
diff --git a/src/Application/AbstractApplication.php b/src/Application/AbstractApplication.php
@@ -4,7 +4,6 @@
 
 use Contributte\Middlewares\IMiddleware;
 use Exception;
-use Nette\SmartObject;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use RuntimeException;