Merge pull request #126 from PavelJurasek/php8

PHP 8 support

.github/workflows/php-package-ci.yml

@@ -0,0 +1,23 @@
+name: Package CI
+
+on:
+  pull_request:
+
+jobs:
+  checks:
+    name: Checks
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php: [ 7.4, 8.0 ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+
+      - run: make composer
+
+      - run: make phpstan
+
+      - run: make tester

Makefile

@@ -0,0 +1,13 @@
+composer:
+	composer validate
+	composer update --no-interaction --prefer-dist
+
+cs:
+	vendor/bin/phpcs --standard=./ruleset.xml --cache=${HOME}/phpcs-cache/.phpcs-cache --encoding=utf-8 -sp src tests/KdybyTests
+	vendor/bin/parallel-lint -e php,phpt --exclude vendor .
+
+phpstan:
+	vendor/bin/phpstan analyse src tests/KdybyTests
+
+tester:
+	vendor/bin/tester -s -c ./tests/php.ini-unix ./tests/KdybyTests/

composer.json

@@ -12,33 +12,25 @@
 			"email": "[email protected]"
 		}
 	],
-	"repositories": [
-		{
-			"type": "git",
-			"url": "https://github.com/CZechBoY/Kdyby-CodingStandard.git"
-		}
-	],
 	"support": {
 		"email": "[email protected]",
 		"issues": "https://github.com/kdyby/events/issues"
 	},
 	"require": {
-		"php": "^7.1",
+		"php": "^7.4 | ^8.0",
 		"nette/di": "^3.0",
-		"nette/utils": "^3.0",
-		"nette/reflection": "^2.4"
+		"nette/utils": "^3.0"
 	},
 	"require-dev": {
-		"kdyby/coding-standard": "^1.0@dev",
 		"nette/application": "^3.0",
 		"nette/bootstrap": "^3.0",
 		"nette/caching": "^3.0",
 		"nette/security": "^3.0",
 		"nette/http": "^3.0",
 		"tracy/tracy": "^2.5",
 		"symfony/event-dispatcher": "^3.0 || ^4.0",
-		"nette/tester": "^2.2",
-		"phpstan/phpstan-shim": "^0.11",
+		"nette/tester": "^2.4",
+		"phpstan/phpstan": "^0.12.88",
 		"jakub-onderka/php-parallel-lint": "^1.0"
 	},
 	"autoload": {

phpstan.neon.dist

@@ -1,5 +1,10 @@
 parameters:
-	level: 7
+	level: 5
 	paths:
 		- src
 		- tests/KdybyTests
+
+	ignoreErrors:
+		-
+			message: '~Method Kdyby\\Events\\SymfonyDispatcher::dispatch\(\) should return object but return statement is missing\.~'
+			path: src/Events/SymfonyDispatcher.php

src/Events/DI/EventsExtension.php

@@ -33,7 +33,6 @@
 use Nette\PhpGenerator\ClassType as ClassTypeGenerator;
 use Nette\PhpGenerator\Helpers as GeneratorHelpers;
 use Nette\PhpGenerator\PhpLiteral;
-use Nette\Reflection\ClassType as ClassTypeReflection;
 use Nette\Utils\Validators;
 use ReflectionProperty;
 use Symfony\Component\EventDispatcher\Event as SymfonyEvent;
@@ -352,7 +351,6 @@ private function autowireEvents(DIContainerBuilder $builder)
 				continue;
 			}
 
-			/** @var \Nette\DI\Definitions\ServiceDefinition $def */
 			if ($this->isAlias($def)) {
 				continue; // alias
 			}
@@ -389,11 +387,11 @@ private function autowireEvents(DIContainerBuilder $builder)
 				continue;
 			}
 
-			$this->bindEventProperties($def, ClassTypeReflection::from($class));
+			$this->bindEventProperties($def, new \ReflectionClass($class));
 		}
 	}
 
-	protected function bindEventProperties(Definition $def, ClassTypeReflection $class)
+	protected function bindEventProperties(Definition $def, \ReflectionClass $class)
 	{
 		/** @var \Nette\DI\Definitions\ServiceDefinition $def */
 		$def = $def instanceof FactoryDefinition ? $def->getResultDefinition() : $def;
@@ -404,18 +402,17 @@ protected function bindEventProperties(Definition $def, ClassTypeReflection $cla
 				continue;
 			}
 
-			if ($property->hasAnnotation('persistent') || $property->hasAnnotation('inject')) { // definitely not an event
+			if (self::propertyHasAnnotation($property, 'persistent') || self::propertyHasAnnotation($property, 'inject')) { // definitely not an event
 				continue;
 			}
 
+			$dispatchAnnotation = self::propertyHasAnnotation($property, 'globalDispatchFirst');
 			$def->addSetup('$' . $name, [
 				new Statement($this->prefix('@manager') . '::createEvent', [
 					[$class->getName(), $name],
 					new PhpLiteral('$service->' . $name),
 					NULL,
-					$property->hasAnnotation('globalDispatchFirst')
-						? (bool) $property->getAnnotation('globalDispatchFirst')
-						: $this->loadedConfig['globalDispatchFirst'],
+					$dispatchAnnotation ?? $this->loadedConfig['globalDispatchFirst'],
 				]),
 			]);
 		}
@@ -489,12 +486,20 @@ private static function createEventSubscriberInstanceWithoutConstructor($class)
 			throw new \InvalidArgumentException('Given class cannot be NULL');
 		}
 
-		$instance = ClassTypeReflection::from($class)->newInstanceWithoutConstructor();
+		$instance = (new \ReflectionClass($class))->newInstanceWithoutConstructor();
 		if (!$instance instanceof EventSubscriber) {
 			throw new \Kdyby\Events\UnexpectedValueException(sprintf('The class %s does not implement %s', $class, EventSubscriber::class));
 		}
 
 		return $instance;
 	}
 
+	private static function propertyHasAnnotation(ReflectionProperty $property, string $annotation): ?bool
+	{
+		$comment = $property->getDocComment();
+
+		$exists = \strpos($comment, "@$annotation") !== FALSE;
+
+		return $exists ? !\stripos($comment, "@$annotation false") : NULL;
+	}
 }

src/Events/Diagnostics/Panel.php

@@ -498,7 +498,7 @@ protected function renderStyles()
 	public static function register(EventManager $eventManager, DIContainer $sl)
 	{
 		/** @var \Kdyby\Events\Diagnostics\Panel $panel */
-		$panel = new static($sl);
+		$panel = new Panel($sl);
 		$panel->setEventManager($eventManager);
 		Debugger::getBar()->addPanel($panel);
 

src/Events/Event.php

@@ -13,7 +13,6 @@
 use ArrayIterator;
 use Doctrine\Common\EventArgs;
 use Kdyby\Events\Diagnostics\Panel;
-use Nette\Reflection\ClassType as ClassTypeReflection;
 use Nette\Utils\Callback;
 use Traversable;
 
@@ -168,7 +167,7 @@ public function getListeners()
 				$args = new EventArgsList(func_get_args());
 
 			} else {
-				$args = ClassTypeReflection::from($argsClass)->newInstanceArgs(func_get_args());
+				$args = (new \ReflectionClass($argsClass))->newInstanceArgs(func_get_args());
 			}
 
 			assert($args instanceof EventArgs);

src/Events/SymfonyDispatcher.php

@@ -10,7 +10,7 @@
 
 namespace Kdyby\Events;
 
-use Symfony\Component\EventDispatcher\Event as SymfonyEvent;
+use Symfony\Contracts\EventDispatcher\Event as SymfonyEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class SymfonyDispatcher implements \Symfony\Component\EventDispatcher\EventDispatcherInterface
@@ -26,6 +26,9 @@ public function __construct(EventManager $eventManager)
 		$this->evm = $eventManager;
 	}
 
+	/**
+	 * @param string|object $eventName
+	 */
 	public function dispatch($eventName, SymfonyEvent $event = NULL)
 	{
 		$this->evm->dispatchEvent($eventName, new EventArgsList([$event]));