FEATURE: Flow 4.0 compatibility

bwaidelich · Feb 15, 2017 · 99de9e4 · 99de9e4
1 parent 521671e
commit 99de9e4
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 26 deletions.
diff --git a/Classes/AccessibleObject.php b/Classes/AccessibleObject.php
@@ -1,8 +1,8 @@
 <?php
 namespace Wwwision\GraphQL;
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Reflection\ObjectAccess;
+use Neos\Flow\Annotations as Flow;
+use Neos\Utility\ObjectAccess;
 
 /**
  * A proxy that exposes all getters of a given object through an ArrayAccess interface

diff --git a/Classes/Controller/StandardController.php b/Classes/Controller/StandardController.php
@@ -3,8 +3,8 @@
 
 use GraphQL\GraphQL;
 use GraphQL\Schema;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Mvc\Controller\ActionController;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Mvc\Controller\ActionController;
 use Wwwision\GraphQL\TypeResolver;
 use Wwwision\GraphQL\View\GraphQlView;
 

diff --git a/Classes/Http/HttpOptionsComponent.php b/Classes/Http/HttpOptionsComponent.php
@@ -1,10 +1,10 @@
 <?php
 namespace Wwwision\GraphQL\Http;
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Http\Component\ComponentChain;
-use TYPO3\Flow\Http\Component\ComponentContext;
-use TYPO3\Flow\Http\Component\ComponentInterface;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Http\Component\ComponentChain;
+use Neos\Flow\Http\Component\ComponentContext;
+use Neos\Flow\Http\Component\ComponentInterface;
 
 /**
  * A simple HTTP Component that captures OPTIONS requests and responds with a general "Allow: GET, POST" header if a matching graphQL endpoint is configured

diff --git a/Classes/IterableAccessibleObject.php b/Classes/IterableAccessibleObject.php
@@ -1,7 +1,7 @@
 <?php
 namespace Wwwision\GraphQL;
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * A proxy that recursively exposes all getters of objects within a collection (\Iterator or array) through an ArrayAccess interface

diff --git a/Classes/TypeResolver.php b/Classes/TypeResolver.php
@@ -3,7 +3,7 @@
 
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\Type;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * A type resolver (aka factory) for GraphQL type definitions.

diff --git a/Classes/View/GraphQlView.php b/Classes/View/GraphQlView.php
@@ -3,11 +3,11 @@
 
 use GraphQL\Error\Error;
 use GraphQL\Executor\ExecutionResult;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Http\Response as HttpResponse;
-use TYPO3\Flow\Log\SystemLoggerInterface;
-use TYPO3\Flow\Mvc\View\AbstractView;
-use TYPO3\Flow\Exception as FlowException;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Http\Response as HttpResponse;
+use Neos\Flow\Log\SystemLoggerInterface;
+use Neos\Flow\Mvc\View\AbstractView;
+use Neos\Flow\Exception as FlowException;
 
 class GraphQlView extends AbstractView
 {

diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
@@ -1,15 +1,16 @@
-TYPO3:
+Neos:
   Flow:
     http:
       chain:
-        'process':
+        process:
           chain:
-            'graphQLOptions':
+            graphQLOptions:
               position: 'before routing'
               component: 'Wwwision\GraphQL\Http\HttpOptionsComponent'
+
 Wwwision:
   GraphQL:
     endpoints: []
 #      'some-endpoint':
 #        'queryType': 'Some\Fully\Qualified\Namespace'
-#        'mutationType': 'Some\Fully\Qualified\Namespace'
+#        'mutationType': 'Some\Fully\Qualified\Namespace'
diff --git a/README.md b/README.md
@@ -75,7 +75,7 @@ And, lastly, activate the corresponding routes:
 `Settings.yaml`:
 
 ```yaml
-TYPO3:
+Neos:
   Flow:
     mvc:
       routes:

diff --git a/Tests/Unit/AccessibleObjectTest.php b/Tests/Unit/AccessibleObjectTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Wwwision\GraphQL\Tests\Unit;
 
-use TYPO3\Flow\Tests\UnitTestCase;
+use Neos\Flow\Tests\UnitTestCase;
 use Wwwision\GraphQL\AccessibleObject;
 use Wwwision\GraphQL\IterableAccessibleObject;
 use Wwwision\GraphQL\Tests\Unit\Fixtures\ExampleObject;
@@ -74,7 +74,7 @@ public function simpleOffsetGetTests($propertyName, $expectedValue)
 
     /**
      * @test
-     * @expectedException \TYPO3\Flow\Reflection\Exception\PropertyNotAccessibleException
+     * @expectedException \Neos\Utility\Exception\PropertyNotAccessibleException
      */
     public function offsetGetThrowsExceptionForUnknownProperties()
     {

diff --git a/Tests/Unit/IterableAccessibleObjectTest.php b/Tests/Unit/IterableAccessibleObjectTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Wwwision\GraphQL\Tests\Unit;
 
-use TYPO3\Flow\Tests\UnitTestCase;
+use Neos\Flow\Tests\UnitTestCase;
 use Wwwision\GraphQL\AccessibleObject;
 use Wwwision\GraphQL\IterableAccessibleObject;
 use Wwwision\GraphQL\Tests\Unit\Fixtures\ExampleObject;

diff --git a/Tests/Unit/TypeResolverTest.php b/Tests/Unit/TypeResolverTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Wwwision\GraphQL\Tests\Unit;
 
-use TYPO3\Flow\Tests\UnitTestCase;
+use Neos\Flow\Tests\UnitTestCase;
 use Wwwision\GraphQL\Tests\Unit\Fixtures\ExampleType;
 use Wwwision\GraphQL\TypeResolver;
 

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "name": "wwwision/graphql",
     "license": "MIT",
     "require": {
-        "typo3/flow": "^3.0",
+        "neos/flow": "^4.0",
         "webonyx/graphql-php": "^0.8.0"
     },
     "autoload": {
@@ -20,6 +20,33 @@
     "extra": {
         "neos": {
             "package-key": "Wwwision.GraphQL"
-        }
+        },
+        "applied-flow-migrations": [
+            "TYPO3.FLOW3-201201261636",
+            "TYPO3.Fluid-201205031303",
+            "TYPO3.FLOW3-201205292145",
+            "TYPO3.FLOW3-201206271128",
+            "TYPO3.FLOW3-201209201112",
+            "TYPO3.Flow-201209251426",
+            "TYPO3.Flow-201211151101",
+            "TYPO3.Flow-201212051340",
+            "TYPO3.Flow-201310031523",
+            "TYPO3.Flow-201405111147",
+            "TYPO3.Fluid-20141113120800",
+            "TYPO3.Flow-20141113121400",
+            "TYPO3.Fluid-20141121091700",
+            "TYPO3.Fluid-20150214130800",
+            "TYPO3.Flow-20151113161300",
+            "TYPO3.Flow-20161115140400",
+            "TYPO3.Flow-20161115140430",
+            "Neos.Flow-20161124204700",
+            "Neos.Flow-20161124204701",
+            "Neos.Flow-20161124224015",
+            "Neos.Eel-20161124230101",
+            "Neos.Kickstart-20161124230102",
+            "Neos.Kickstarter-20161125110814",
+            "Neos.Flow-20161125124112",
+            "TYPO3.FluidAdaptor-20161130112935"
+        ]
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,7 +75,7 @@ And, lastly, activate the corresponding routes: @@
     `Settings.yaml`:
     ```yaml
-    TYPO3:
+    Neos:
       Flow:
         mvc:
           routes:
@@ Expand Down @@