[TASK:T12] Fix GitHub - Actions

Relates: #3376
TYPO3-Solr · Oct 28, 2022 · 3a623cd · 3a623cd
1 parent dc7e5a4
commit 3a623cd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 23 deletions.
diff --git a/Build/Test/bootstrap.sh b/Build/Test/bootstrap.sh
@@ -91,23 +91,7 @@ echo "Using extension path $EXTENSION_ROOTPATH"
 echo "Using package path $TYPO3_PATH_PACKAGES"
 echo "Using web path $TYPO3_PATH_WEB"
 
-# Install TYPO3 sources
-if [[ $TYPO3_VERSION = *"main"* ]]; then
-  composer config minimum-stability dev
-fi
-
-if ! composer require --dev --update-with-dependencies --prefer-source \
-  typo3/cms-core:"$TYPO3_VERSION" \
-  typo3/cms-backend:"$TYPO3_VERSION" \
-  typo3/cms-recordlist:"$TYPO3_VERSION" \
-  typo3/cms-fluid:"$TYPO3_VERSION" \
-  typo3/cms-fluid-styled-content:"$TYPO3_VERSION" \
-  typo3/cms-frontend:"$TYPO3_VERSION" \
-  typo3/cms-extbase:"$TYPO3_VERSION" \
-  typo3/cms-reports:"$TYPO3_VERSION" \
-  typo3/cms-scheduler:"$TYPO3_VERSION" \
-  typo3/cms-tstemplate:"$TYPO3_VERSION" \
-  typo3/cms-install:"$TYPO3_VERSION"
+if ! composer tests:setup
 then
   echo "The test environment could not be installed by composer as expected. Please fix this issue."
   exit 1

diff --git a/Tests/Integration/IntegrationTest.php b/Tests/Integration/IntegrationTest.php
@@ -64,7 +64,7 @@ abstract class IntegrationTest extends FunctionalTestCase
 {
     use SiteBasedTestTrait;
 
-    protected $coreExtensionsToLoad = [
+    protected array $coreExtensionsToLoad = [
         'scheduler',
         'fluid_styled_content',
     ];

diff --git a/Tests/Unit/UnitTest.php b/Tests/Unit/UnitTest.php
@@ -27,7 +27,7 @@
  */
 abstract class UnitTest extends UnitTestCase
 {
-    protected $resetSingletonInstances = true;
+    protected bool $resetSingletonInstances = true;
 
     protected function setUp(): void
     {

diff --git a/composer.json b/composer.json
@@ -21,14 +21,14 @@
     "docs": "https://docs.typo3.org/p/apache-solr-for-typo3/solr/main/en-us/"
   },
   "require": {
-    "php": "^7.4.0 || ^8.0",
+    "php": "^8.1",
     "ext-dom": "*",
     "ext-json": "*",
     "ext-libxml": "*",
     "ext-simplexml": "*",
     "solarium/solarium": "6.2.7",
     "typo3/cms-backend": "*",
-    "typo3/cms-core": "^12.0.0 || dev-main",
+    "typo3/cms-core": "^12",
     "typo3/cms-extbase": "*",
     "typo3/cms-fluid": "*",
     "typo3/cms-frontend": "*",
@@ -40,7 +40,7 @@
     "typo3/coding-standards": ">=0.5.0",
     "phpunit/phpunit": "^9.5",
     "phpspec/prophecy-phpunit":"*",
-    "typo3/testing-framework": "^6.12",
+    "typo3/testing-framework": "dev-main",
     "typo3/cms-fluid-styled-content": "*",
     "scrutinizer/ocular": "*",
     "sclable/xml-lint": "*"
@@ -82,7 +82,7 @@
     "tests:restore-git": "echo \"Retore composer.json to initial state:\" && git checkout composer.json",
     "tests:env": [
       "if [ -z ${TYPO3_VERSION+x} ]; then >&2 echo \"Can not proceed, because env var TYPO3_VERSION is not set\"; exit 1; else echo \"Setup test environment for TYPO3 ${TYPO3_VERSION}\"; fi",
-      "if [ \"${TYPO3_VERSION#*dev}\" != \"dev\" ]; then $COMPOSER_BINARY config minimum-stability dev; fi"
+      "if [ $(echo $TYPO3_VERSION | grep -c dev) -eq 1 ]; then $COMPOSER_BINARY config minimum-stability dev; fi"
     ],
     "tests:setup": [
       "@tests:env",