Merge pull request #82 from oliverklee/feature/typo3-12

sascha-egerer · web-flow · commit 8e532ddf2ad3 · 2022-10-18T20:29:11.000+02:00
[FEATURE] Add support for TYPO3 12
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -54,6 +54,18 @@ jobs:
           - typo3-version: "^11.5"
             php-version: "8.2"
             composer-flags: " --prefer-lowest"
+          - typo3-version: "^12.0"
+            php-version: "8.1"
+            composer-flags: ""
+          - typo3-version: "^12.0"
+            php-version: "8.1"
+            composer-flags: " --prefer-lowest"
+          - typo3-version: "^12.0"
+            php-version: "8.2"
+            composer-flags: ""
+          - typo3-version: "^12.0"
+            php-version: "8.2"
+            composer-flags: " --prefer-lowest"
 
     steps:
       - name: "Checkout"
diff --git a/composer.json b/composer.json
@@ -9,8 +9,8 @@
         "php": "^7.2 || ^8.0",
         "phpstan/phpstan": "^1.8.9",
         "nikic/php-parser": "^4.15.1",
-        "typo3/cms-core": "^10.4 || ^11.5",
-        "typo3/cms-extbase": "^10.4 || ^11.5"
+        "typo3/cms-core": "^10.4 || ^11.5 || ^12.0",
+        "typo3/cms-extbase": "^10.4 || ^11.5 || ^12.0"
     },
     "require-dev": {
         "consistence-community/coding-standard": "^3.10.1",
diff --git a/src/Type/ObjectManagerDynamicReturnTypeExtension.php b/src/Type/ObjectManagerDynamicReturnTypeExtension.php
@@ -11,19 +11,24 @@
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 
+/**
+ * @deprecated This class will be dropped once support for TYPO3 <= 10 is dropped.
+ */
 class ObjectManagerDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
 
 	public function getClass(): string
 	{
-		return \TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class;
+		return interface_exists(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)
+			? \TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class : '';
 	}
 
 	public function isMethodSupported(
 		MethodReflection $methodReflection
 	): bool
 	{
-		return $methodReflection->getName() === 'get';
+		return interface_exists(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)
+			&& $methodReflection->getName() === 'get';
 	}
 
 	public function getTypeFromMethodCall(

Original file line number	Diff line number	Diff line change
`@@ -11,19 +11,24 @@`
`11`	`11`	`use PHPStan\Type\ObjectType;`
`12`	`12`	`use PHPStan\Type\Type;`
`13`	`13`
	`14`	`+/**`
	`15`	`+ * @deprecated This class will be dropped once support for TYPO3 <= 10 is dropped.`
	`16`	`+ */`
`14`	`17`	`class ObjectManagerDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension`
`15`	`18`	`{`
`16`	`19`
`17`	`20`	`public function getClass(): string`
`18`	`21`	`{`
`19`		`- return \TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class;`
	`22`	`+ return interface_exists(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)`
	`23`	`+ ? \TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class : '';`
`20`	`24`	`}`
`21`	`25`
`22`	`26`	`public function isMethodSupported(`
`23`	`27`	`MethodReflection $methodReflection`
`24`	`28`	`): bool`
`25`	`29`	`{`
`26`		`- return $methodReflection->getName() === 'get';`
	`30`	`+ return interface_exists(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)`
	`31`	`+ && $methodReflection->getName() === 'get';`
`27`	`32`	`}`
`28`	`33`
`29`	`34`	`public function getTypeFromMethodCall(`