From b2efb797902de5bc1dcc3d858ee26cc50ed70fa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Barto=C5=A1?= <bartos.developer152@gmail.com>
Date: Tue, 26 Nov 2019 17:49:33 +0100
Subject: [PATCH] Update build

---
 .travis.yml                                   |  9 +++----
 Makefile                                      | 24 ++++++++++---------
 composer.json                                 |  7 ++----
 ruleset.xml                                   |  6 ++---
 .../SampleAnnotation.php                      |  2 +-
 tests/{fixtures => Fixtures}/SampleClass.php  |  2 +-
 tests/{toolkit => Toolkit}/NeonLoader.php     |  2 +-
 tests/{toolkit => Toolkit}/TestCase.php       | 10 ++------
 .../Unit/DI/AnnotationsExtensionTest.php      |  6 ++---
 tests/{cases => }/Unit/Reader/ReaderTest.php  | 10 ++++----
 10 files changed, 35 insertions(+), 43 deletions(-)
 rename tests/{fixtures => Fixtures}/SampleAnnotation.php (89%)
 rename tests/{fixtures => Fixtures}/SampleClass.php (72%)
 rename tests/{toolkit => Toolkit}/NeonLoader.php (85%)
 rename tests/{toolkit => Toolkit}/TestCase.php (67%)
 rename tests/{cases => }/Unit/DI/AnnotationsExtensionTest.php (94%)
 rename tests/{cases => }/Unit/Reader/ReaderTest.php (82%)

diff --git a/.travis.yml b/.travis.yml
index 0aa14b4..2ca55a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: php
+
 php:
   - 7.2
   - 7.3
@@ -9,15 +10,15 @@ before_install:
   - phpenv config-rm xdebug.ini || return 0 # Turn off XDebug
 
 install:
-  - travis_retry composer install --no-progress --prefer-dist # Install dependencies
+  - travis_retry composer install --no-progress --prefer-dist
 
 script:
-  - make tests # Tests
+  - make tests
 
 jobs:
   include:
-    - env: title="Lowest Dependencies 7.3"
-      php: 7.3
+    - env: title="Lowest Dependencies"
+      php: 7.2
       install:
         - travis_retry composer update --no-progress --prefer-dist --prefer-lowest --prefer-stable
       script:
diff --git a/Makefile b/Makefile
index 0130198..3b10a16 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,29 @@
 .PHONY: qa lint cs csf phpstan tests coverage
 
 all:
-	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$' | xargs
+	@awk 'BEGIN {FS = ":.*##"; printf "Usage:\n  make \033[36m<target>\033[0m\n\nTargets:\n"}'
+	@grep -h -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[36m%-20s\033[0m %s\n", $$1, $$2}'
 
-vendor: composer.json composer.lock
-	composer install
+# QA
 
-qa: lint phpstan cs
+qa: lint phpstan cs ## Check code quality - coding style and static analysis
 
-lint: vendor
+lint: ## Check PHP files syntax
 	vendor/bin/linter src tests
 
-cs: vendor
+cs: ## Check PHP files coding style
 	vendor/bin/codesniffer src tests
 
-csf: vendor
+csf: ## Fix PHP files coding style
 	vendor/bin/codefixer src tests
 
-phpstan: vendor
+phpstan: ## Analyse code with PHPStan
 	vendor/bin/phpstan analyse -l max -c phpstan.neon src
 
-tests: vendor
+# Tests
+
+tests: ## Run all tests
 	vendor/bin/phpunit tests --cache-result-file=tests/tmp/phpunit.cache --colors=always
 
-coverage: vendor
-	vendor/bin/phpdbg -qrr vendor/bin/phpunit tests --cache-result-file=tests/tmp/phpunit.cache --colors=always -c tests/coverage.xml
+coverage: ## Generate code coverage in XML format
+	phpdbg -qrr vendor/bin/phpunit tests --cache-result-file=tests/tmp/phpunit.cache --colors=always -c tests/coverage.xml
diff --git a/composer.json b/composer.json
index c7dc810..1e39254 100644
--- a/composer.json
+++ b/composer.json
@@ -22,9 +22,8 @@
     "doctrine/cache": "^1.8.0"
   },
   "require-dev": {
-    "mockery/mockery": "^1.2.2",
     "nettrine/cache": "^0.1.0",
-    "ninjify/qa": "^0.9.0",
+    "ninjify/qa": "^0.10.0",
     "phpstan/extension-installer": "^1.0",
     "phpstan/phpstan-deprecation-rules": "^0.11.0",
     "phpstan/phpstan-nette": "^0.11.0",
@@ -39,9 +38,7 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Tests\\Cases\\": "tests/cases",
-      "Tests\\Fixtures\\": "tests/fixtures",
-      "Tests\\Toolkit\\": "tests/toolkit"
+      "Tests\\Nettrine\\Annotations\\": "tests"
     }
   },
   "minimum-stability": "dev",
diff --git a/ruleset.xml b/ruleset.xml
index f6f2d13..58316af 100644
--- a/ruleset.xml
+++ b/ruleset.xml
@@ -6,10 +6,8 @@
 	<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
 		<properties>
 			<property name="rootNamespaces" type="array" value="
-				src=>Nettrine\Annotations,
-				tests/cases=>Tests\Cases,
-				tests/fixtures=>Tests\Fixtures,
-				tests/toolkit=>Tests\Toolkit
+				src   => Nettrine\Annotations,
+				tests => Tests\Nettrine\Annotations,
 			"/>
 		</properties>
 	</rule>
diff --git a/tests/fixtures/SampleAnnotation.php b/tests/Fixtures/SampleAnnotation.php
similarity index 89%
rename from tests/fixtures/SampleAnnotation.php
rename to tests/Fixtures/SampleAnnotation.php
index 3e02c77..cf1407d 100644
--- a/tests/fixtures/SampleAnnotation.php
+++ b/tests/Fixtures/SampleAnnotation.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace Tests\Fixtures;
+namespace Tests\Nettrine\Annotations\Fixtures;
 
 use Doctrine\Common\Annotations\Annotation;
 
diff --git a/tests/fixtures/SampleClass.php b/tests/Fixtures/SampleClass.php
similarity index 72%
rename from tests/fixtures/SampleClass.php
rename to tests/Fixtures/SampleClass.php
index 7dd94df..737c915 100644
--- a/tests/fixtures/SampleClass.php
+++ b/tests/Fixtures/SampleClass.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace Tests\Fixtures;
+namespace Tests\Nettrine\Annotations\Fixtures;
 
 /**
  * @ignoredAnnotation
diff --git a/tests/toolkit/NeonLoader.php b/tests/Toolkit/NeonLoader.php
similarity index 85%
rename from tests/toolkit/NeonLoader.php
rename to tests/Toolkit/NeonLoader.php
index 8c0d6d8..f4be021 100644
--- a/tests/toolkit/NeonLoader.php
+++ b/tests/Toolkit/NeonLoader.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace Tests\Toolkit;
+namespace Tests\Nettrine\Annotations\Toolkit;
 
 use Nette\DI\Config\Adapters\NeonAdapter;
 use Nette\Neon\Neon;
diff --git a/tests/toolkit/TestCase.php b/tests/Toolkit/TestCase.php
similarity index 67%
rename from tests/toolkit/TestCase.php
rename to tests/Toolkit/TestCase.php
index 15fd204..39ec931 100644
--- a/tests/toolkit/TestCase.php
+++ b/tests/Toolkit/TestCase.php
@@ -1,8 +1,7 @@
 <?php declare(strict_types = 1);
 
-namespace Tests\Toolkit;
+namespace Tests\Nettrine\Annotations\Toolkit;
 
-use Mockery;
 use PHPUnit\Framework\TestCase as PHPUnitTestCase;
 
 abstract class TestCase extends PHPUnitTestCase
@@ -17,13 +16,8 @@ protected function setUp(): void
 		}
 
 		if (!defined('FIXTURES_PATH')) {
-			define('FIXTURES_PATH', __DIR__ . '/../fixtures');
+			define('FIXTURES_PATH', __DIR__ . '/../Fixtures');
 		}
 	}
 
-	protected function tearDown(): void
-	{
-		Mockery::close();
-	}
-
 }
diff --git a/tests/cases/Unit/DI/AnnotationsExtensionTest.php b/tests/Unit/DI/AnnotationsExtensionTest.php
similarity index 94%
rename from tests/cases/Unit/DI/AnnotationsExtensionTest.php
rename to tests/Unit/DI/AnnotationsExtensionTest.php
index 628f9fc..e3846ee 100644
--- a/tests/cases/Unit/DI/AnnotationsExtensionTest.php
+++ b/tests/Unit/DI/AnnotationsExtensionTest.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace Tests\Cases\Unit\DI;
+namespace Tests\Nettrine\Annotations\Unit\DI;
 
 use Doctrine\Common\Annotations\CachedReader;
 use Doctrine\Common\Annotations\Reader;
@@ -13,8 +13,8 @@
 use Nette\InvalidStateException;
 use Nettrine\Annotations\DI\AnnotationsExtension;
 use Nettrine\Cache\DI\CacheExtension;
-use Tests\Toolkit\NeonLoader;
-use Tests\Toolkit\TestCase;
+use Tests\Nettrine\Annotations\Toolkit\NeonLoader;
+use Tests\Nettrine\Annotations\Toolkit\TestCase;
 
 final class AnnotationsExtensionTest extends TestCase
 {
diff --git a/tests/cases/Unit/Reader/ReaderTest.php b/tests/Unit/Reader/ReaderTest.php
similarity index 82%
rename from tests/cases/Unit/Reader/ReaderTest.php
rename to tests/Unit/Reader/ReaderTest.php
index 98ba3ef..ba37b60 100644
--- a/tests/cases/Unit/Reader/ReaderTest.php
+++ b/tests/Unit/Reader/ReaderTest.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace Tests\Cases\Unit\Reader;
+namespace Tests\Nettrine\Annotations\Unit\Reader;
 
 use Doctrine\Common\Annotations\Reader;
 use Nette\DI\Compiler;
@@ -8,10 +8,10 @@
 use Nette\DI\ContainerLoader;
 use Nettrine\Annotations\DI\AnnotationsExtension;
 use ReflectionClass;
-use Tests\Fixtures\SampleAnnotation;
-use Tests\Fixtures\SampleClass;
-use Tests\Toolkit\NeonLoader;
-use Tests\Toolkit\TestCase;
+use Tests\Nettrine\Annotations\Fixtures\SampleAnnotation;
+use Tests\Nettrine\Annotations\Fixtures\SampleClass;
+use Tests\Nettrine\Annotations\Toolkit\NeonLoader;
+use Tests\Nettrine\Annotations\Toolkit\TestCase;
 
 final class ReaderTest extends TestCase
 {