...
  View open merge request
Commits (3)
...@@ -27,20 +27,18 @@ ...@@ -27,20 +27,18 @@
], ],
"require": { "require": {
"php": ">=7.0", "php": ">=7.0",
"typo3/cms-core": "^8.7",
"t3o/ter-layout": "@dev", "t3o/ter-layout": "@dev",
"t3o/ter-soap": "@dev", "t3o/ter-soap": "@dev",
"t3o/ter-frontend": "@dev", "t3o/ter-frontend": "@dev",
"helhum/typo3-console": "^5.7", "helhum/typo3-console": "^5.7",
"dmitryd/typo3-realurl": "^2.5",
"apache-solr-for-typo3/solr": "^9.0", "apache-solr-for-typo3/solr": "^9.0",
"t3o/t3olayout": "^3.0", "t3o/t3olayout": "dev-develop-v9",
"nikic/php-parser": "^3.1", "nikic/php-parser": "^4.0",
"gordalina/cachetool": "^3.2", "gordalina/cachetool": "^4.0",
"helhum/typo3-secure-web": "^0.2.9" "helhum/typo3-secure-web": "^0.2.9"
}, },
"require-dev": { "require-dev": {
"nimut/testing-framework": "^3.0" "nimut/testing-framework": "^4.0"
}, },
"config": { "config": {
"store-auths": false, "store-auths": false,
......
This diff is collapsed.
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
}, },
"license": "GPL-2.0+", "license": "GPL-2.0+",
"require": { "require": {
"typo3/cms-core": ">= 8.7.0, <= 8.7.99" "typo3/cms-core": "^8.7 || ^9.5"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
...@@ -47,7 +47,7 @@ class ArrayAssurer extends \PhpParser\NodeVisitorAbstract ...@@ -47,7 +47,7 @@ class ArrayAssurer extends \PhpParser\NodeVisitorAbstract
} }
} }
// We must not have another assignment // We must not have another assignment
throw new \UnexpectedValueException(); return \PhpParser\NodeTraverser::REMOVE_NODE;
} }
if (!( if (!(
$node instanceof Node\Name $node instanceof Node\Name
...@@ -57,9 +57,10 @@ class ArrayAssurer extends \PhpParser\NodeVisitorAbstract ...@@ -57,9 +57,10 @@ class ArrayAssurer extends \PhpParser\NodeVisitorAbstract
|| $node instanceof Expr\ArrayItem || $node instanceof Expr\ArrayItem
|| $node instanceof Expr\ConstFetch || $node instanceof Expr\ConstFetch
|| $node instanceof Expr\Variable || $node instanceof Expr\Variable
|| $node instanceof Node\Stmt\Expression
) )
) { ) {
return false; return \PhpParser\NodeTraverser::REMOVE_NODE;
} }
} }
} }
...@@ -73,10 +73,9 @@ class ArchiveUtilityTest extends \Nimut\TestingFramework\TestCase\UnitTestCase ...@@ -73,10 +73,9 @@ class ArchiveUtilityTest extends \Nimut\TestingFramework\TestCase\UnitTestCase
/** /**
* @test * @test
*/ */
public function extractEmConfReturnsSaveArrayOnlyForInvalidNodeFunction() public function extractEmConfReturnsNullForInvalidNodeFunction()
{ {
$code = '<?php $EM_CONF[$_EXTKEY] = array(\'bar\' => \'baz\'); function foo() {} ?>'; $code = '<?php $EM_CONF[$_EXTKEY] = array(\'bar\' => \'baz\'); function foo() {} ?>';
$expected = ['bar' => 'baz'];
$subject = $this->getAccessibleMock( $subject = $this->getAccessibleMock(
\T3o\TerFe2\Utility\ArchiveUtility::class, \T3o\TerFe2\Utility\ArchiveUtility::class,
...@@ -84,8 +83,7 @@ class ArchiveUtilityTest extends \Nimut\TestingFramework\TestCase\UnitTestCase ...@@ -84,8 +83,7 @@ class ArchiveUtilityTest extends \Nimut\TestingFramework\TestCase\UnitTestCase
); );
$emConf = $subject->_call('extractEmConf', $code); $emConf = $subject->_call('extractEmConf', $code);
$this->assertNotNull($emConf); $this->assertNull($emConf);
$this->assertSame($expected, $emConf);
} }
/** /**
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
}, },
"license": "GPL-2.0+", "license": "GPL-2.0+",
"require": { "require": {
"typo3/cms-core": ">= 8.7.0, <= 8.7.99" "typo3/cms-core": "^8.7 || ^9.5"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
}, },
"license": "GPL-2.0+", "license": "GPL-2.0+",
"require": { "require": {
"typo3/cms-core": ">= 8.7.0, <= 8.7.99" "typo3/cms-core": "^8.7 || ^9.5"
}, },
"replace": { "replace": {
"ter_layout": "self.version" "ter_layout": "self.version"
......