Merge pull request #118 from dlubitz/neos-9

TASK: Neos 9 compatibility

Author: dlubitz

Classes/Domain/Model/Index.php

@@ -104,7 +104,7 @@ class Index
      * @param Client $client $client
      * @throws ElasticSearchException
      */
-    public function __construct(string $name, Client $client = null)
+    public function __construct(string $name, ?Client $client = null)
     {
         $name = trim($name);
         if (empty($name) || strpos($name, '_') === 0) {
@@ -170,7 +170,7 @@ public function exists(): bool
      * @throws ElasticSearchException
      * @throws \Neos\Flow\Http\Exception
      */
-    public function request(string $method, string $path = null, array $arguments = [], $content = null, bool $prefixIndex = true): Response
+    public function request(string $method, ?string $path = null, array $arguments = [], $content = null, bool $prefixIndex = true): Response
     {
         if ($this->client === null) {
             throw new ElasticSearchException('The client of the index "' . $this->prefixName() . '" is not set, hence no requests can be done.', 1566313883);

Classes/Indexer/Object/ObjectIndexer.php

@@ -78,7 +78,7 @@ class ObjectIndexer
      * @param Client $client
      * @return void
      */
-    public function indexObject($object, $signalInformation = null, Client $client = null)
+    public function indexObject($object, $signalInformation = null, ?Client $client = null)
     {
         $type = $this->getIndexTypeForObject($object, $client);
         if ($type === null) {
@@ -98,7 +98,7 @@ public function indexObject($object, $signalInformation = null, Client $client =
      * @param Client $client
      * @return GenericType
      */
-    protected function getIndexTypeForObject($object, Client $client = null)
+    protected function getIndexTypeForObject($object, ?Client $client = null)
     {
         if ($client === null) {
             $client = $this->client;
@@ -144,7 +144,7 @@ protected function getIndexablePropertiesAndValuesFromObject($object)
      * @param Client $client
      * @return void
      */
-    public function removeObject($object, $signalInformation = null, Client $client = null)
+    public function removeObject($object, $signalInformation = null, ?Client $client = null)
     {
         $type = $this->getIndexTypeForObject($object, $client);
         if ($type === null) {
@@ -162,7 +162,7 @@ public function removeObject($object, $signalInformation = null, Client $client
      * @param Client $client
      * @return string one of this' ACTION_TYPE_* constants or NULL if no action is required
      */
-    public function objectIndexActionRequired($object, Client $client = null)
+    public function objectIndexActionRequired($object, ?Client $client = null)
     {
         $type = $this->getIndexTypeForObject($object, $client);
         if ($type === null) {

Classes/Transfer/Exception.php

@@ -39,7 +39,7 @@ class Exception extends ElasticSearchException
      * @param RequestInterface|null $request
      * @param \Exception|null $previous
      */
-    public function __construct($message, $code, ResponseInterface $response, RequestInterface $request = null, \Exception $previous = null)
+    public function __construct($message, $code, ResponseInterface $response, ?RequestInterface $request = null, \Exception $previous = null)
     {
         $this->response = $response;
         $this->request = $request;

Classes/Transfer/Response.php

@@ -37,7 +37,7 @@ class Response
      * @throws Exception
      * @throws Exception\ApiException
      */
-    public function __construct(ResponseInterface $response, RequestInterface $request = null)
+    public function __construct(ResponseInterface $response, ?RequestInterface $request = null)
     {
         $this->originalResponse = $response;
 

Tests/Functional/Domain/DocumentTest.php

@@ -37,7 +37,7 @@ public function simpleDocumentDataProvider()
      * @dataProvider simpleDocumentDataProvider
      * @test
      */
-    public function idOfFreshNewDocumentIsPopulatedAfterStoring(array $data = null)
+    public function idOfFreshNewDocumentIsPopulatedAfterStoring(?array $data = null)
     {
         $document = new Document(new TwitterType($this->testingIndex), $data);
         static::assertNull($document->getId());
@@ -49,7 +49,7 @@ public function idOfFreshNewDocumentIsPopulatedAfterStoring(array $data = null)
      * @dataProvider simpleDocumentDataProvider
      * @test
      */
-    public function versionOfFreshNewDocumentIsCreatedAfterStoringAndIncreasedAfterSubsequentStoring(array $data = null)
+    public function versionOfFreshNewDocumentIsCreatedAfterStoringAndIncreasedAfterSubsequentStoring(?array $data = null)
     {
         $document = new Document(new TwitterType($this->testingIndex), $data);
         static::assertNull($document->getVersion());

composer.json

@@ -8,10 +8,10 @@
         "doctrine/annotations": "^1.0",
         "doctrine/collections": "^1.0",
         "doctrine/orm": "^2.0",
-        "neos/error-messages": "^6.0 || ^7.0 || ^8.0 || dev-master",
-        "neos/flow": "^6.0 || ^7.0 || ^8.0 || dev-master",
-        "neos/utility-arrays": "^6.0 || ^7.0 || ^8.0 || dev-master",
-        "neos/utility-objecthandling": "^6.0 || ^7.0 || ^8.0 || dev-master"
+        "neos/error-messages": "^7.3 || ^8.0 || ^9.0 || dev-master",
+        "neos/flow": "^7.3 || ^8.0 || ^9.0 || dev-master",
+        "neos/utility-arrays": "^7.3 || ^8.0 || ^9.0 || dev-master",
+        "neos/utility-objecthandling": "^7.3 || ^8.0 || ^9.0 || dev-master"
     },
     "autoload": {
         "psr-4": {