Merge pull request #77 from adrorocker/1.x

Add support for php8.1

Author: eigan

.github/workflows/ci.yml

@@ -6,13 +6,17 @@ jobs:
     name: PHP ${{ matrix.php }} - doctrine/orm ${{ matrix.orm }}
     strategy:
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1']
         orm: ['2.6', '2.7', '2.8', '2.9', '2.10', '2.11']
         exclude:
           - php: '8.0'
             orm: '2.6.0'
           - php: '8.0'
             orm: '2.7.0'
+          - php: '8.1'
+            orm: '2.6.0'
+          - php: '8.1'
+            orm: '2.7.0'
     steps:
       - uses: actions/checkout@v2
       - name: Setup PHP

composer.json

@@ -23,7 +23,7 @@
     }
   ],
   "require": {
-    "php": "^7.2|^8.0",
+    "php": "^7.2|^8.0|^8.1",
     "doctrine/dbal": "^2.10|^3.3",
     "doctrine/orm": "^2.6",
     "doctrine/inflector": "^1.4|^2.0",

src/Builders/Entity.php

@@ -54,7 +54,7 @@ public function readOnly()
     public function cacheable($usage = ClassMetadataInfo::CACHE_USAGE_READ_ONLY, $region = null)
     {
         $meta = $this->builder->getClassMetadata();
-        $meta->enableCache(compact('usage', $region === null ?: 'region'));
+        $meta->enableCache(compact('usage', $region === null ? [] : 'region'));
 
         return $this;
     }

tests/Builders/EntityListenersTest.php

@@ -36,10 +36,10 @@ protected function setUp(): void
      *
      * @param string      $event
      * @param string      $listener
-     * @param string|null $method
      * @param string      $expectedMethod
+     * @param string|null $method
      */
-    public function test_can_add_event_listeners($event, $listener, $method = null, $expectedMethod)
+    public function test_can_add_event_listeners($event, $listener, $expectedMethod, $method = null)
     {
         $this->builder->{$event}($listener, $method);
 
@@ -108,7 +108,7 @@ public function eventsProvider()
             [Events::onFlush, StubEntityListener::class, 'handle', 'handle'],
             [Events::postFlush, StubEntityListener::class, 'handle', 'handle'],
             [Events::onClear, StubEntityListener::class, 'handle', 'handle'],
-            [Events::onClear, StubEntityListener::class, null, 'onClear'],
+            [Events::onClear, StubEntityListener::class, 'onClear', null],
         ];
     }
 }