Merge pull request #9 from bearsunday/fix-php8

Fix Stream attribute
bearsunday · Mar 7, 2021 · 76978ee · 76978ee
2 parents d4ce9d1 + 311d80f
commit 76978ee
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -27,9 +27,10 @@
      },
      "require": {
           "php": "^7.3 || ^8.0",
-          "bear/resource": "^1.15",
+          "bear/resource": "^1.15.1",
           "bear/sunday": "^1.5",
-          "ray/di": "^2.11"
+          "ray/di": "^2.11",
+          "ray/aop": "^2.10.4"
      },
      "require-dev": {
           "phpunit/phpunit": "^9.5",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd" bootstrap="tests/bootstrap.php">
   <coverage processUncoveredFiles="true">
     <include>
       <directory suffix=".php">src</directory>
     </include>
   </coverage>
   <testsuites>
-    <testsuite name="all">
+    <testsuite name="BEAR.Streamer test suite">
       <directory>tests</directory>
     </testsuite>
   </testsuites>

diff --git a/src/Streamer.php b/src/Streamer.php
@@ -31,6 +31,7 @@ final class Streamer implements StreamerInterface
      *
      * @Stream
      */
+    #[Stream]
     public function __construct($stream)
     {
         $this->stream = $stream;

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+use Koriym\Attributes\AttributeReader;
+use Ray\ServiceLocator\ServiceLocator;
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+// no annotation in PHP 8
+if (PHP_MAJOR_VERSION >= 8) {
+    ServiceLocator::setReader(new AttributeReader());
+}