Merge branch 'hotfix/1.2.1'

Author: codeFareith

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [Unreleased]
 - nothing, yet
 
+## [1.2.1] - 2020-06-12
+### Fixed
+- Various bugs caused by `use`- and `declare(strict_type=1);`-Statements in extension's bootstrap files (`ext_localconf.php`, `ext_tables.php`, `be_users.php`, `fe_users.php`, `sys_template.php` & `tt_content.php`)
+
 ## [1.2.0] - 2020-06-12
 ### Changed
 - Add Signal/Slot-Dispatcher in Google Authenticator Setup Handler
@@ -173,7 +177,8 @@ to meet frontend requirements
 ## [1.0.0] - 2018-06-17
 - Initial development
 
-[Unreleased]: https://github.com/codeFareith/cf_google_authenticator/compare/v1.2.0...HEAD
+[Unreleased]: https://github.com/codeFareith/cf_google_authenticator/compare/v1.2.1...HEAD
+[1.2.1]: https://github.com/codeFareith/cf_google_authenticator/compare/v1.2.0...v1.2.1
 [1.2.0]: https://github.com/codeFareith/cf_google_authenticator/compare/v1.1.7...v1.2.0
 [1.1.7]: https://github.com/codeFareith/cf_google_authenticator/compare/v1.1.6...v1.1.7
 [1.1.6]: https://github.com/codeFareith/cf_google_authenticator/compare/v1.1.5...v1.1.6

Configuration/TCA/Overrides/be_users.php

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php
 /**
  * Table configuration for 'be_users'
  *
@@ -15,21 +15,17 @@
  * @see           https://typo3.org
  */
 
-use CodeFareith\CfGoogleAuthenticator\Hook\UserSettings;
-use CodeFareith\CfGoogleAuthenticator\Utility\PathUtility;
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
-
 defined('TYPO3_MODE')
     or die('Access denied');
 
 call_user_func(
     static function () {
-        ExtensionManagementUtility::addTCAcolumns(
+        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns(
             'be_users',
             [
                 'tx_cfgoogleauthenticator_enabled' => [
                     'exclude' => false,
-                    'label' => PathUtility::makeLocalLangLinkPath(
+                    'label' => \CodeFareith\CfGoogleAuthenticator\Utility\PathUtility::makeLocalLangLinkPath(
                         'be_users.tx_cfgoogleauthenticator_enabled',
                         'locallang_db.xlf'
                     ),
@@ -39,22 +35,22 @@ static function () {
                 ],
                 'tx_cfgoogleauthenticator_secret' => [
                     'exclude' => false,
-                    'label' => PathUtility::makeLocalLangLinkPath(
+                    'label' => \CodeFareith\CfGoogleAuthenticator\Utility\PathUtility::makeLocalLangLinkPath(
                         'be_users.tx_cfgoogleauthenticator_secret',
                         'locallang_db.xlf'
                     ),
                     'config' => [
                         'type' => 'user',
-                        'userFunc' => UserSettings::class . '->createSecretField',
+                        'userFunc' => \CodeFareith\CfGoogleAuthenticator\Hook\UserSettings::class . '->createSecretField',
                     ],
                 ],
             ]
         );
 
-        ExtensionManagementUtility::addToAllTCAtypes(
+        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
             'be_users',
             '--div--;'
-            . PathUtility::makeLocalLangLinkPath(
+            . \CodeFareith\CfGoogleAuthenticator\Utility\PathUtility::makeLocalLangLinkPath(
                 'tx_cfgoogleauthenticator',
                 'locallang_db.xlf'
             ) . ',

Configuration/TCA/Overrides/fe_users.php

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php
 /**
  * Table configuration for 'fe_users'
  *
@@ -15,21 +15,17 @@
  * @see           https://typo3.org
  */
 
-use CodeFareith\CfGoogleAuthenticator\Hook\UserSettings;
-use CodeFareith\CfGoogleAuthenticator\Utility\PathUtility;
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
-
 defined('TYPO3_MODE')
     or die('Access denied');
 
 call_user_func(
     static function () {
-        ExtensionManagementUtility::addTCAcolumns(
+        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns(
             'fe_users',
             [
                 'tx_cfgoogleauthenticator_enabled' => [
                     'exclude' => false,
-                    'label' => PathUtility::makeLocalLangLinkPath(
+                    'label' => \CodeFareith\CfGoogleAuthenticator\Utility\PathUtility::makeLocalLangLinkPath(
                         'fe_users.tx_cfgoogleauthenticator_enabled',
                         'locallang_db.xlf'
                     ),
@@ -39,22 +35,22 @@ static function () {
                 ],
                 'tx_cfgoogleauthenticator_secret' => [
                     'exclude' => false,
-                    'label' => PathUtility::makeLocalLangLinkPath(
+                    'label' => \CodeFareith\CfGoogleAuthenticator\Utility\PathUtility::makeLocalLangLinkPath(
                         'be_users.tx_cfgoogleauthenticator_secret',
                         'locallang_db.xlf'
                     ),
                     'config' => [
                         'type' => 'user',
-                        'userFunc' => UserSettings::class . '->createSecretField',
+                        'userFunc' => \CodeFareith\CfGoogleAuthenticator\Hook\UserSettings::class . '->createSecretField',
                     ],
                 ],
             ]
         );
 
-        ExtensionManagementUtility::addToAllTCAtypes(
+        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
             'fe_users',
             '--div--;'
-            . PathUtility::makeLocalLangLinkPath(
+            . \CodeFareith\CfGoogleAuthenticator\Utility\PathUtility::makeLocalLangLinkPath(
                 'tx_cfgoogleauthenticator',
                 'locallang_db.xlf'
             ) . ',

Configuration/TCA/Overrides/sys_template.php

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php
 /**
  * Table configuration for 'sys_template'
  *
@@ -15,14 +15,12 @@
  * @see           https://typo3.org
  */
 
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
-
 defined('TYPO3_MODE')
     or die('Access denied');
 
 call_user_func(
     static function () {
-        ExtensionManagementUtility::addStaticFile(
+        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(
             'cf_google_authenticator',
             'Configuration/TypoScript',
             '[CodeFareith] Google Authenticator'

Configuration/TCA/Overrides/tt_content.php

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php
 /**
  * Table configuration for 'tt_content'
  *
@@ -14,19 +14,15 @@
  * @see           https://typo3.org
  */
 
-use CodeFareith\CfGoogleAuthenticator\Utility\ExtensionBasicDataUtility;
-use CodeFareith\CfGoogleAuthenticator\Utility\PathUtility;
-use TYPO3\CMS\Extbase\Utility\ExtensionUtility;
-
 defined('TYPO3_MODE')
     or die('Access denied');
 
 call_user_func(
     static function () {
-        ExtensionUtility::registerPlugin(
-            ExtensionBasicDataUtility::getExtensionKey(),
+        \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+            \CodeFareith\CfGoogleAuthenticator\Utility\ExtensionBasicDataUtility::getExtensionKey(),
             'Setup',
-            PathUtility::makeLocalLangLinkPath('plugin.setup')
+            \CodeFareith\CfGoogleAuthenticator\Utility\PathUtility::makeLocalLangLinkPath('plugin.setup')
         );
     }
 );

composer.json

@@ -104,7 +104,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.1.x-dev"
+      "dev-master": "1.2.x-dev"
     },
     "typo3/cms": {
       "extension-key": "cf_google_authenticator",