[TASK] Fix PHP warnings and 404 for files (#27)

* [TASK] Add .DS_Store to .gitignore * [TASK] Update to use minimum PHP 8.1 * [TASK] Change runTests.sh * [TASK] Additional update for Build/Scripts/runTests.sh * [BUGFIX] Check if languageField isset * [BUGFIX] Remove unused connector_overrides from JS * [TASK] Update to version ''2.0.2''
pixelant · Dec 1, 2023 · ce3e49d · ce3e49d
1 parent cf03df6
commit ce3e49d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /*.idea
+.DS_Store
 /.Build/*
 /.fleet
 /.php-cs-fixer.cache

diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh
@@ -57,17 +57,14 @@ Options:
             - postgres: use postgres
             - sqlite: use sqlite
 
-    -p <7.4|8.0|8.1|8.2>
+    -p <8.1|8.2>
         Specifies the PHP minor version to be used
-            - 7.4: (default) use PHP 7.4
-            - 8.0: use PHP 8.0
             - 8.1: use PHP 8.1
             - 8.2: use PHP 8.2
 
-    -t <11|12>
+    -t <12>
         Only with -s composerUpdate
         Specifies the TYPO3 core major version to be used
-            - 11: (default) use TYPO3 core v11
             - 12: use TYPO3 core v12
 
     -e "<phpunit options>"
@@ -119,7 +116,7 @@ cd ../testing-docker || exit 1
 ROOT_DIR=`realpath ${PWD}/../../`
 TEST_SUITE="unit"
 DBMS="mariadb"
-PHP_VERSION="8.1"
+PHP_VERSION="8.2"
 TYPO3_VERSION="12"
 PHP_XDEBUG_ON=0
 PHP_XDEBUG_PORT=9003

diff --git a/Classes/Xclass/Form/Container/FilesControlContainer.php b/Classes/Xclass/Form/Container/FilesControlContainer.php
@@ -114,9 +114,11 @@ protected function getExtensionConfigurationManager(): ExtensionConfigurationMan
         /** @var ExtensionConfigurationManager $extensionConfigurationManager */
         $extensionConfigurationManager = GeneralUtility::makeInstance(ExtensionConfigurationManager::class);
 
-        $languageField = $GLOBALS['TCA'][$this->data['tableName']]['ctrl']['languageField'];
-
         $languageId = -1;
+        if (isset($GLOBALS['TCA'][$this->data['tableName']]['ctrl']['languageField'])) {
+            $languageField = $GLOBALS['TCA'][$this->data['tableName']]['ctrl']['languageField'];
+        }
+
         if ($languageField) {
             $languageId = (int)$this->data['databaseRow'][$languageField];
         }

diff --git a/Resources/Public/JavaScript/qbank-connector.js b/Resources/Public/JavaScript/qbank-connector.js
@@ -93,24 +93,13 @@
 	 * Returns an object with user AND potential connector config override for the current user
 	 */
             this.getUser = function() {
-                var delayed = new QBCJQ.Deferred(), userRequest = this.call("accounts/me"), settingsRequest = this.call("accounts/settings.json/connector_override"), object = {};
+                var delayed = new QBCJQ.Deferred(), userRequest = this.call("accounts/me"), object = {};
                 userRequest.then(function(user) {
                     object.user = user;
                     if (object.settings !== undefined) {
                         delayed.resolve(object);
                     }
                 });
-                settingsRequest.then(function(settings) {
-                    object.settings = JSON.parse(settings);
-                    if (object.user) {
-                        delayed.resolve(object);
-                    }
-                }, function() {
-                    object.settings = false;
-                    if (object.user) {
-                        delayed.resolve(object);
-                    }
-                });
                 return delayed;
             };
             this.listCategories = function() {

diff --git a/Resources/Public/JavaScript/qbank-connector.min.js b/Resources/Public/JavaScript/qbank-connector.min.js
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
 		}
 	],
 	"require": {
-		"php": "^8.0",
+		"php": "^8.1",
 		"qbnk/qbank3api-phpwrapper": "^7.0",
 		"typo3/cms-core": "^12.4"
 	},

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -8,7 +8,7 @@
     'author_email' => 'info@pixelant.net',
     'author_company' => 'Pixelant',
     'state' => 'stable',
-    'version' => '2.0.1',
+    'version' => '2.0.2',
     'constraints' => [
         'depends' => [
             'typo3' => '12.0.0-12.4.99',