Update build

Author: mabar

Diff for: .editorconfig

@@ -1,20 +1,16 @@
 # EditorConfig is awesome: http://EditorConfig.org
 
-# Top-most EditorConfig file
 root = true
 
-# Unix-style newlines with a newline ending every file
 [*]
+charset = utf-8
 end_of_line = lf
 insert_final_newline = true
-
-# JS / PHP
-[*.{js,php,phpt}]
-charset = utf-8
+trim_trailing_whitespace = true
 indent_style = tab
-indent_size = 4
+indent_size = tab
+tab_width = 4
 
-# Composer
-[{composer.json}]
+[{*.json,*.yml,*.md}]
 indent_style = space
 indent_size = 2

Diff for: .gitattributes

@@ -1,9 +1,10 @@
-/.docs export-ignore
-/tests export-ignore
-/.editorconfig export-ignore
-/.gitattributes export-ignore
-/.gitignore export-ignore
-/.travis.yml export-ignore
-/LICENSE export-ignore
-/phpstan.neon export-ignore
-/README.md export-ignore
+# Not archived
+.docs export-ignore
+tests export-ignore
+.editorconfig export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.travis.yml export-ignore
+phpstan.neon export-ignore
+README.md export-ignore
+ruleset.xml export-ignore

Diff for: .gitignore

@@ -5,5 +5,5 @@
 /vendor
 /composer.lock
 
-# Temp
-/temp
+# Tests
+/coverage.xml

Diff for: .travis.yml

@@ -1,15 +1,24 @@
 language: php
 php:
-    - 7.1
-    - 7.2
+  - 7.1
+  - 7.2
+  - 7.3
+
+before_install:
+  # Turn off XDebug
+  - phpenv config-rm xdebug.ini || return 0
 
 install:
   # Composer
   - travis_retry composer install --no-progress --prefer-dist
 
 script:
-  # Tester
-  - composer run-script tester
+  # Tests
+  - composer run-script tests
+
+after_failure:
+  # Print *.actual content
+  - for i in $(find tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done
 
 jobs:
   include:
@@ -18,34 +27,35 @@ jobs:
       install:
         - travis_retry composer update --no-progress --prefer-dist --prefer-lowest
       script:
-        - composer run-script tester
+        - composer run-script tests
 
     - stage: Quality Assurance
       php: 7.1
       script:
         - composer run-script qa
 
+    - stage: Phpstan
+      php: 7.1
+      script:
+        - composer run-script phpstan
+
     - stage: Test Coverage
+      if: branch = master AND type = push
       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
+        - composer global require php-coveralls/php-coveralls ^2.1.0
+        - ~/.composer/vendor/bin/php-coveralls --verbose --config tests/.coveralls.yml
 
-    - stage: Phpstan
+    - stage: Outdated Dependencies
+      if: branch = master AND type = cron
       php: 7.1
       script:
-        - composer run-script phpstan-install
-        - composer run-script phpstan
+        - composer outdated --direct --strict
 
   allow_failures:
     - stage: Test Coverage
-    - stage: Phpstan
-
-after_failure:
-  # Print *.actual content
-  - for i in $(find tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done
 
 sudo: false
 

Diff for: README.md

@@ -7,10 +7,10 @@
 [![Build Status](https://img.shields.io/travis/nettrine/annotations.svg?style=flat-square)](https://travis-ci.org/nettrine/annotations)
 [![Code coverage](https://img.shields.io/coveralls/nettrine/annotations.svg?style=flat-square)](https://coveralls.io/r/nettrine/annotations)
 [![Licence](https://img.shields.io/packagist/l/nettrine/annotations.svg?style=flat-square)](https://packagist.org/packages/nettrine/annotations)
-
 [![Downloads this Month](https://img.shields.io/packagist/dm/nettrine/annotations.svg?style=flat-square)](https://packagist.org/packages/nettrine/annotations)
 [![Downloads total](https://img.shields.io/packagist/dt/nettrine/annotations.svg?style=flat-square)](https://packagist.org/packages/nettrine/annotations)
 [![Latest stable](https://img.shields.io/packagist/v/nettrine/annotations.svg?style=flat-square)](https://packagist.org/packages/nettrine/annotations)
+[![PHPStan](https://img.shields.io/badge/PHPStan-enabled-brightgreen.svg?style=flat-square)](https://github.com/phpstan/phpstan)
 
 ## Discussion / Help
 
@@ -55,7 +55,7 @@ composer require nettrine/annotations
         <a href="https://github.com/benijo">Josef Benjač</a>
       </td>
     </tr>
-  <tbody>
+  </tbody>
 </table>
 
 -----

Diff for: composer.json

@@ -3,7 +3,7 @@
   "description": "Doctrine Annotations for Nette Framework",
   "keywords": ["nettrine", "nette", "doctrine", "annotations"],
   "type": "library",
-  "license": ["MIT"],
+  "license": "MIT",
   "homepage": "https://github.com/nettrine/annotations",
   "authors": [
     {
@@ -14,12 +14,16 @@
   "require": {
     "php": ">=7.1",
     "doctrine/annotations": "^1.6.0",
-    "nette/di": "^2.4.14",
-    "doctrine/cache": "^1.8.0"
+    "doctrine/cache": "^1.8.0",
+    "nette/di": "^2.4.14"
   },
   "require-dev": {
     "ninjify/qa": "^0.8.0",
-    "ninjify/nunjuck": "^0.2.0"
+    "ninjify/nunjuck": "^0.2.0",
+    "phpstan/phpstan-shim": "^0.10.6",
+    "phpstan/phpstan-deprecation-rules": "^0.10.2",
+    "phpstan/phpstan-nette": "^0.10.1",
+    "phpstan/phpstan-strict-rules": "^0.10.1"
   },
   "autoload": {
     "psr-4": {
@@ -39,19 +43,14 @@
       "linter src tests",
       "codesniffer src tests"
     ],
-    "tester": [
+    "tests": [
       "tester -s -p php --colors 1 -C tests/cases"
     ],
     "coverage": [
-      "tester -s -p php --colors 1 -C -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.9",
-      "composer require -d temp/phpstan phpstan/phpstan-nette:0.9"
+      "tester -s -p phpdbg --colors 1 -C --coverage ./coverage.xml --coverage-src ./src tests/cases"
     ],
     "phpstan": [
-      "temp/phpstan/vendor/bin/phpstan analyse -l max -c phpstan.neon src"
+      "vendor/bin/phpstan analyse -l max -c phpstan.neon src"
     ]
   },
   "extra": {

Diff for: phpstan.neon

@@ -1,8 +1,10 @@
 includes:
-	- temp/phpstan/vendor/phpstan/phpstan-nette/extension.neon
-	- temp/phpstan/vendor/phpstan/phpstan-nette/rules.neon
+	- vendor/phpstan/phpstan-deprecation-rules/rules.neon
+	- vendor/phpstan/phpstan-nette/extension.neon
+	- vendor/phpstan/phpstan-nette/rules.neon
+	- vendor/phpstan/phpstan-strict-rules/rules.neon
 
 parameters:
     ignoreErrors:
-        - '#Parameter \#1 \$reader of method Doctrine\\Common\\Persistence\\Mapping\\Driver\\AnnotationDriver::__construct\(\) expects Doctrine\\Common\\Annotations\\AnnotationReader, Doctrine\\Common\\Annotations\\Reader given.#'
-        - '#Property Doctrine\\Common\\Persistence\\Mapping\\Driver\\AnnotationDriver::\$reader \(Doctrine\\Common\\Annotations\\AnnotationReader\) does not accept Doctrine\\Common\\Annotations\\Reader.#'
+    	# No replacement available
+    	- '#Call to deprecated method registerUniqueLoader\(\) of class Doctrine\\Common\\Annotations\\AnnotationRegistry.#'

Diff for: src/DI/AnnotationsExtension.php

@@ -9,6 +9,7 @@
 use Doctrine\Common\Cache\ArrayCache;
 use Doctrine\Common\Cache\FilesystemCache;
 use Nette\DI\CompilerExtension;
+use Nette\DI\Helpers;
 use Nette\DI\Statement;
 use Nette\PhpGenerator\ClassType;
 use Nette\PhpGenerator\PhpLiteral;
@@ -32,7 +33,7 @@ public function loadConfiguration(): void
 		$config = $this->getConfig($this->defaults);
 
 		$reader = $builder->addDefinition($this->prefix('delegatedReader'))
-			->setClass(AnnotationReader::class)
+			->setFactory(AnnotationReader::class)
 			->setAutowired(false);
 
 		foreach ((array) $config['ignore'] as $annotationName) {
@@ -43,7 +44,7 @@ public function loadConfiguration(): void
 		$this->loadCacheConfiguration();
 
 		$builder->addDefinition($this->prefix('reader'))
-			->setClass(Reader::class)
+			->setType(Reader::class)
 			->setFactory(CachedReader::class, [
 				$this->prefix('@delegatedReader'),
 				$this->prefix('@cache'),
@@ -61,7 +62,7 @@ protected function loadCacheConfiguration(): void
 		if (is_string($config['cache'])) {
 			// FilesystemCache needs extra configuration (paths)
 			if ($config['cache'] === FilesystemCache::class) {
-				$path = $builder->expand('%tempDir%/cache/Doctrine.Annotations');
+				$path = Helpers::expand('%tempDir%/cache/Doctrine.Annotations', $builder->parameters);
 				$builder->addDefinition($this->prefix('cache'))
 					->setFactory($config['cache'], [$path])
 					->setAutowired(false);
@@ -75,7 +76,7 @@ protected function loadCacheConfiguration(): void
 			$builder->addDefinition($this->prefix('cache'))
 				->setFactory($config['cache'])
 				->setAutowired(false);
-		} elseif (!$config['cache']) {
+		} elseif ($config['cache'] === null || $config['cache'] === false) {
 			// No cache (memory only)
 			$builder->addDefinition($this->prefix('cache'))
 				->setFactory(ArrayCache::class)

Diff for: tests/.coveralls.yml

@@ -1,4 +1,4 @@
 # for php-coveralls
 service_name: travis-ci
 coverage_clover: coverage.xml
-json_path: coverage.json
+json_path: coverage.json

Diff for: tests/.gitignore

@@ -7,4 +7,4 @@
 
 # Files
 /*.log
-/*.html
+/*.html