Merge branch 'release/7.0.14'

garbast · garbast · commit bb7f328c40b7 · 2024-04-07T16:04:01.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,10 +11,10 @@ jobs:
 
   resources:
     name: Resources tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Lint SCSS
         run: Build/Scripts/additionalTests.sh -s lintScss
@@ -62,7 +62,7 @@ jobs:
             testpath: 'Tests/Functional'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Lint php
         run: |
@@ -115,12 +115,12 @@ jobs:
     needs: [ resources, testsuite ]
     if: startsWith(github.ref, 'refs/tags/')
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     name: TYPO3 TER release
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Publish to TER
         uses: tomasnorre/typo3-upload-ter@v2
diff --git a/Build/package-lock.json b/Build/package-lock.json
diff --git a/Classes/Command/ImportLocationsCommand.php b/Classes/Command/ImportLocationsCommand.php
@@ -69,7 +69,7 @@ public function __construct(
     /**
      * Configure the command by defining the name, options and arguments
      */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->addArgument(
diff --git a/Classes/Controller/MapController.php b/Classes/Controller/MapController.php
@@ -145,7 +145,7 @@ protected function setTypeConverter(): void
         }
     }
 
-    protected function initializeAction()
+    protected function initializeAction(): void
     {
         if (is_array($this->settings['override'] ?? false)) {
             $override = $this->settings['override'];
@@ -599,7 +599,7 @@ public function getView(): ViewInterface
         return $this->view;
     }
 
-    protected function getErrorFlashMessage()
+    protected function getErrorFlashMessage(): bool
     {
         return false;
     }
diff --git a/Configuration/TCA/tx_storefinder_domain_model_attribute.php b/Configuration/TCA/tx_storefinder_domain_model_attribute.php
@@ -46,7 +46,7 @@
                 // no sys_language_uid = -1 allowed explicitly!
                 'foreign_table_where' =>
                     'AND tx_storefinder_domain_model_attribute.pid = ###CURRENT_PID###
-                     AND tx_storefinder_domain_model_attribute.sys_language_uid IN = 0',
+                     AND tx_storefinder_domain_model_attribute.sys_language_uid = 0',
                 'default' => 0
             ]
         ],
diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
@@ -1,8 +1,8 @@
 [general]
 
 project = store_finder
-version = 7.0.13
-release = 7.0.13
+version = 7.0.14
+release = 7.0.14
 copyright = since 2013 by evoWeb
 
 [notify]
diff --git a/composer.json b/composer.json
@@ -31,18 +31,25 @@
 	},
 	"require": {
 		"php": "^8.1",
-		"typo3/cms-core": "^12.4 || dev-main",
-		"typo3/cms-backend": "^12.4 || dev-main",
-		"typo3/cms-extbase": "^12.4 || dev-main",
-		"typo3/cms-fluid": "^12.4 || dev-main",
-		"typo3/cms-frontend": "^12.4 || dev-main",
-		"typo3/cms-install": "^12.4 || dev-main",
+		"typo3/cms-core": "^12.4 || 12.4.x-dev || dev-main",
+		"typo3/cms-backend": "^12.4 || 12.4.x-dev || dev-main",
+		"typo3/cms-extbase": "^12.4 || 12.4.x-dev || dev-main",
+		"typo3/cms-fluid": "^12.4 || 12.4.x-dev || dev-main",
+		"typo3/cms-frontend": "^12.4 || 12.4.x-dev || dev-main",
+		"typo3/cms-install": "^12.4 || 12.4.x-dev || dev-main",
 
+		"typo3/cms-extensionmanager": "^12.4 || 12.4.x-dev || dev-main",
+		"doctrine/annotations": "^1.13.3 || ^2.0",
+		"doctrine/dbal": "^3.7.2",
 		"geocoder-php/google-maps-provider": "^4.7.0",
 		"guzzlehttp/guzzle": "^7.7.0",
 		"phpoffice/phpspreadsheet": "^1.28.0",
+		"psr/event-dispatcher": "^1.0",
+		"psr/http-message": "^1.1 || ^2.0",
+		"psr/http-server-handler": "^1.0",
+		"psr/http-server-middleware": "^1.0",
 		"sjbr/static-info-tables": "dev-master",
-		"typo3/cms-extensionmanager": "^12.4 || dev-main"
+		"symfony/console": "^6.4 || ^7.0"
 	},
 	"require-dev": {
 		"typo3/testing-framework": "^8.0.2 || dev-main"
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -8,7 +8,7 @@
     'author_email' => 'store-finder@evoweb.de',
     'author_company' => 'evoWeb',
     'state' => 'stable',
-    'version' => '7.0.13',
+    'version' => '7.0.14',
     'constraints' => [
         'depends' => [
             'typo3' => '12.4.0-12.4.99',

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function __construct(`
`69`	`69`	`/**`
`70`	`70`	`* Configure the command by defining the name, options and arguments`
`71`	`71`	`*/`
`72`		`- protected function configure()`
	`72`	`+ protected function configure(): void`
`73`	`73`	`{`
`74`	`74`	`$this`
`75`	`75`	`->addArgument(`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ protected function setTypeConverter(): void`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`
`148`		`- protected function initializeAction()`
	`148`	`+ protected function initializeAction(): void`
`149`	`149`	`{`
`150`	`150`	`if (is_array($this->settings['override'] ?? false)) {`
`151`	`151`	`$override = $this->settings['override'];`
`@@ -599,7 +599,7 @@ public function getView(): ViewInterface`
`599`	`599`	`return $this->view;`
`600`	`600`	`}`
`601`	`601`
`602`		`- protected function getErrorFlashMessage()`
	`602`	`+ protected function getErrorFlashMessage(): bool`
`603`	`603`	`{`
`604`	`604`	`return false;`
`605`	`605`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`	`// no sys_language_uid = -1 allowed explicitly!`
`47`	`47`	`'foreign_table_where' =>`
`48`	`48`	`'AND tx_storefinder_domain_model_attribute.pid = ###CURRENT_PID###`
`49`		`- AND tx_storefinder_domain_model_attribute.sys_language_uid IN = 0',`
	`49`	`+ AND tx_storefinder_domain_model_attribute.sys_language_uid = 0',`
`50`	`50`	`'default' => 0`
`51`	`51`	`]`
`52`	`52`	`],`