diff --git a/.gitignore b/.gitignore index f466925..cb3987a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,6 @@ node_modules /gulpfile.js /composer.lock /composer.json -/FriendsOfRedaxo/addon/UsageCheck/Tests - +/lib/Tests +.phpunit.cache +_docs diff --git a/FriendsOfRedaxo/addon/UsageCheck/Config.php b/FriendsOfRedaxo/addon/UsageCheck/Config.php deleted file mode 100644 index 6d32446..0000000 --- a/FriendsOfRedaxo/addon/UsageCheck/Config.php +++ /dev/null @@ -1,49 +0,0 @@ - diff --git a/fragments/modules/details/picture.php b/fragments/modules/details/picture.php index c358d0b..d63acc1 100644 --- a/fragments/modules/details/picture.php +++ b/fragments/modules/details/picture.php @@ -1,7 +1,7 @@ errors) > 0) { $fragment = new rex_fragment(['msg' => $this->errors]); diff --git a/fragments/modules/modules.php b/fragments/modules/modules.php index 8b7a435..e62112d 100644 --- a/fragments/modules/modules.php +++ b/fragments/modules/modules.php @@ -1,6 +1,6 @@ diff --git a/fragments/modules/pictures.php b/fragments/modules/pictures.php index 311cc56..cffced7 100644 --- a/fragments/modules/pictures.php +++ b/fragments/modules/pictures.php @@ -1,8 +1,8 @@ getComplexPerm('media'); diff --git a/fragments/modules/templates.php b/fragments/modules/templates.php index f084a33..030ae6f 100644 --- a/fragments/modules/templates.php +++ b/fragments/modules/templates.php @@ -1,6 +1,6 @@ diff --git a/help.php b/help.php index f5aa324..239dd44 100644 --- a/help.php +++ b/help.php @@ -2,16 +2,8 @@

Kompatibilität

diff --git a/install.php b/install.php deleted file mode 100644 index da5a0e0..0000000 --- a/install.php +++ /dev/null @@ -1,9 +0,0 @@ - $item) { + if (isset($backtrace[$key]['file']) && isset($backtrace[$key]['line'])) { + if (stristr($backtrace[$key]['file'], '/usage_check/')) { + continue; + } + + $backtraceText = ' in '.$backtrace[$key]['file'].': '.$backtrace[$key]['line']; + break; + } + $i++; + } + + $msg = "Deprecated class name found: ".$oldName.$backtraceText.PHP_EOL.'New class: '.$newName; + + class_alias($newName, $oldName); + + user_error($msg, E_USER_DEPRECATED); + $name = $newName; + } + + + if (!stristr($name, __NAMESPACE__)) { + return; // not a UsageCheck class + } + + if (class_exists($name)) { + return; + } + + //namespace parts not in directory structure. + $name = str_replace(__NAMESPACE__, '', $name); + + $filename = self::getBaseDir().'/'.str_replace('\\', '/', $name).'.php'; + if (file_exists($filename)) { + require $filename; + return; + } +// throw new \Exception($filename.' not found'); + return; + } +} diff --git a/FriendsOfRedaxo/addon/UsageCheck/Enum/ModuleType.php b/lib/Enum/ModuleType.php similarity index 80% rename from FriendsOfRedaxo/addon/UsageCheck/Enum/ModuleType.php rename to lib/Enum/ModuleType.php index bb6b18f..ef08797 100644 --- a/FriendsOfRedaxo/addon/UsageCheck/Enum/ModuleType.php +++ b/lib/Enum/ModuleType.php @@ -4,13 +4,13 @@ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license * Click nbfs://nbhost/SystemFileSystem/Templates/Scripting/PHPEnum.php to edit this template */ -namespace FriendsOfRedaxo\addon\UsageCheck\Enum; +namespace FriendsOfRedaxo\UsageCheck\Enum; -use FriendsOfRedaxo\addon\UsageCheck\Lib\BaseModule; -use FriendsOfRedaxo\addon\UsageCheck\Modules\Actions; -use FriendsOfRedaxo\addon\UsageCheck\Modules\Modules; -use FriendsOfRedaxo\addon\UsageCheck\Modules\Pictures; -use FriendsOfRedaxo\addon\UsageCheck\Modules\Templates; +use FriendsOfRedaxo\UsageCheck\Lib\BaseModule; +use FriendsOfRedaxo\UsageCheck\Modules\Actions; +use FriendsOfRedaxo\UsageCheck\Modules\Modules; +use FriendsOfRedaxo\UsageCheck\Modules\Pictures; +use FriendsOfRedaxo\UsageCheck\Modules\Templates; use rex_i18n; /** diff --git a/FriendsOfRedaxo/addon/UsageCheck/Enum/Perm.php b/lib/Enum/Perm.php similarity index 89% rename from FriendsOfRedaxo/addon/UsageCheck/Enum/Perm.php rename to lib/Enum/Perm.php index 2358834..81a1ca1 100644 --- a/FriendsOfRedaxo/addon/UsageCheck/Enum/Perm.php +++ b/lib/Enum/Perm.php @@ -4,7 +4,7 @@ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license * Click nbfs://nbhost/SystemFileSystem/Templates/Scripting/PHPEnum.php to edit this template */ -namespace FriendsOfRedaxo\addon\UsageCheck\Enum; +namespace FriendsOfRedaxo\UsageCheck\Enum; /** * diff --git a/FriendsOfRedaxo/addon/UsageCheck/Error.php b/lib/Error.php similarity index 95% rename from FriendsOfRedaxo/addon/UsageCheck/Error.php rename to lib/Error.php index e2c147f..b381a80 100644 --- a/FriendsOfRedaxo/addon/UsageCheck/Error.php +++ b/lib/Error.php @@ -3,12 +3,11 @@ /** * Datei für die Error-Klasse * - * @version 1.0 / 2015-10-27 * @author akrys */ -namespace FriendsOfRedaxo\addon\UsageCheck; +namespace FriendsOfRedaxo\UsageCheck; -use FriendsOfRedaxo\addon\UsageCheck\Exception\CloneException; +use FriendsOfRedaxo\UsageCheck\Exception\CloneException; use Iterator; use rex_fragment; diff --git a/FriendsOfRedaxo/addon/UsageCheck/Exception/CloneException.php b/lib/Exception/CloneException.php similarity index 74% rename from FriendsOfRedaxo/addon/UsageCheck/Exception/CloneException.php rename to lib/Exception/CloneException.php index 80bfbbd..dbe4a05 100644 --- a/FriendsOfRedaxo/addon/UsageCheck/Exception/CloneException.php +++ b/lib/Exception/CloneException.php @@ -5,10 +5,9 @@ * * Die Exception verhindert, dass Singleton-Objekte geklont werden können. * - * @version 1.0 / 2015-10-27 * @author akrys */ -namespace FriendsOfRedaxo\addon\UsageCheck\Exception; +namespace FriendsOfRedaxo\UsageCheck\Exception; /** * Description of CloneException diff --git a/FriendsOfRedaxo/addon/UsageCheck/Exception/FunctionNotCallableException.php b/lib/Exception/FunctionNotCallableException.php similarity index 80% rename from FriendsOfRedaxo/addon/UsageCheck/Exception/FunctionNotCallableException.php rename to lib/Exception/FunctionNotCallableException.php index 012de4b..a75066a 100644 --- a/FriendsOfRedaxo/addon/UsageCheck/Exception/FunctionNotCallableException.php +++ b/lib/Exception/FunctionNotCallableException.php @@ -6,10 +6,9 @@ * Die Exception wird geworfen, wenn ein Funktionsaufruf ungültig war. z.B. wenn keine gültige Redaxo-Version erkannt * wurde. * - * @version 1.0 / 2016-02-14 * @author akrys */ -namespace FriendsOfRedaxo\addon\UsageCheck\Exception; +namespace FriendsOfRedaxo\UsageCheck\Exception; /** * Description of FunctionNotCallableException diff --git a/lib/Exception/InvalidParameterException.php b/lib/Exception/InvalidParameterException.php new file mode 100644 index 0000000..a6fb3e8 --- /dev/null +++ b/lib/Exception/InvalidParameterException.php @@ -0,0 +1,20 @@ +getRexSql(); diff --git a/FriendsOfRedaxo/addon/UsageCheck/Permission.php b/lib/Permission.php similarity index 92% rename from FriendsOfRedaxo/addon/UsageCheck/Permission.php rename to lib/Permission.php index 7f0640c..48a9b7f 100644 --- a/FriendsOfRedaxo/addon/UsageCheck/Permission.php +++ b/lib/Permission.php @@ -3,11 +3,11 @@ /** * User-Rechte */ -namespace FriendsOfRedaxo\addon\UsageCheck; +namespace FriendsOfRedaxo\UsageCheck; use Exception; -use FriendsOfRedaxo\addon\UsageCheck\Enum\Perm; -use FriendsOfRedaxo\addon\UsageCheck\Exception\CloneException; +use FriendsOfRedaxo\UsageCheck\Enum\Perm; +use FriendsOfRedaxo\UsageCheck\Exception\CloneException; use rex; use rex_media_perm; use rex_module_perm; diff --git a/package.yml b/package.yml index 71248c2..02201ad 100644 --- a/package.yml +++ b/package.yml @@ -1,5 +1,5 @@ package: usage_check -version: '3.1' +version: '3.2' author: Axel Krysztofiak supportpage: https://github.com/akrys/redaxo-usage_check #load: early diff --git a/pages/_action.php b/pages/_action.php index b5842c2..86d4a96 100644 --- a/pages/_action.php +++ b/pages/_action.php @@ -3,11 +3,10 @@ /** * Frontend-Ausagbe für die Seite Actions */ -require_once __DIR__.'/../FriendsOfRedaxo/addon/UsageCheck/Config.php'; -use FriendsOfRedaxo\addon\UsageCheck\Addon; -use FriendsOfRedaxo\addon\UsageCheck\Config; -use FriendsOfRedaxo\addon\UsageCheck\Modules\Actions; +use FriendsOfRedaxo\UsageCheck\Addon; +use FriendsOfRedaxo\UsageCheck\Config; +use FriendsOfRedaxo\UsageCheck\Modules\Actions; if(!isset($subpage)) { throw new \Exception("this file should not be called directly."); @@ -20,7 +19,6 @@ echo rex_view::title($title->parse('fragments/title.php')); -require_once __DIR__.'/../FriendsOfRedaxo/addon/UsageCheck/Modules/Actions.php'; $actions = new Actions(); $actions->setRexSql(rex_sql::factory()); diff --git a/pages/_changelog.php b/pages/_changelog.php index 50a9496..26ebaea 100644 --- a/pages/_changelog.php +++ b/pages/_changelog.php @@ -3,9 +3,7 @@ /** * Frontend-Ausagbe für die Seite Changelog */ -require_once __DIR__.'/../FriendsOfRedaxo/addon/UsageCheck/Config.php'; - -use FriendsOfRedaxo\addon\UsageCheck\Addon; +use FriendsOfRedaxo\UsageCheck\Addon; $title = new rex_fragment(); $title->setVar('name', Addon::getInstance()->getName()); diff --git a/pages/_details.php b/pages/_details.php index 387cf56..f569d73 100644 --- a/pages/_details.php +++ b/pages/_details.php @@ -1,11 +1,11 @@ setVar('name', Addon::getInstance()->getName()); diff --git a/pages/_picture.php b/pages/_picture.php index 88a8909..ccc41b1 100644 --- a/pages/_picture.php +++ b/pages/_picture.php @@ -3,9 +3,9 @@ /** * Anzeige der nicht verwendeten Bilder. */ -use FriendsOfRedaxo\addon\UsageCheck\Addon; -use FriendsOfRedaxo\addon\UsageCheck\Config; -use FriendsOfRedaxo\addon\UsageCheck\Modules\Pictures; +use FriendsOfRedaxo\UsageCheck\Addon; +use FriendsOfRedaxo\UsageCheck\Config; +use FriendsOfRedaxo\UsageCheck\Modules\Pictures; if(!isset($subpage)) { throw new \Exception("this file should not be called directly."); diff --git a/pages/_template.php b/pages/_template.php index a2808a7..bc54899 100644 --- a/pages/_template.php +++ b/pages/_template.php @@ -3,9 +3,9 @@ /** * Frontend-Ausagbe für die Seite Tempalte */ -use FriendsOfRedaxo\addon\UsageCheck\Addon; -use FriendsOfRedaxo\addon\UsageCheck\Config; -use FriendsOfRedaxo\addon\UsageCheck\Modules\Templates; +use FriendsOfRedaxo\UsageCheck\Addon; +use FriendsOfRedaxo\UsageCheck\Config; +use FriendsOfRedaxo\UsageCheck\Modules\Templates; if(!isset($subpage)) { throw new \Exception("this file should not be called directly."); diff --git a/pages/index.php b/pages/index.php index 7de37ed..a38a7bd 100644 --- a/pages/index.php +++ b/pages/index.php @@ -1,6 +1,6 @@
diff --git a/pages/release_notes/de/2024-09-13_3.2.php b/pages/release_notes/de/2024-09-13_3.2.php new file mode 100644 index 0000000..c29445c --- /dev/null +++ b/pages/release_notes/de/2024-09-13_3.2.php @@ -0,0 +1,12 @@ + + diff --git a/pages/release_notes/en/2024-09-13_3.2.php b/pages/release_notes/en/2024-09-13_3.2.php new file mode 100644 index 0000000..230688e --- /dev/null +++ b/pages/release_notes/en/2024-09-13_3.2.php @@ -0,0 +1,12 @@ + +