diff --git a/Changelog b/Changelog index 157d9380f..6519b3122 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2017-17-16 DariusIII + * Chg: Replace app with App in classes used * Chg: Update composer.lock 2017-07-14 DariusIII * Fix: Remove $adapter assignment from install and installtest diff --git a/_install/install_nntmux.php b/_install/install_nntmux.php index f5a2637d0..d98781766 100644 --- a/_install/install_nntmux.php +++ b/_install/install_nntmux.php @@ -6,7 +6,7 @@ if (!defined('NN_INSTALLER')) { require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'bootstrap.php'; include_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'nntmux' . DIRECTORY_SEPARATOR . 'constants.php'; -use app\extensions\util\Versions; +use App\extensions\util\Versions; use nntmux\config\Configure; use nntmux\db\DB; use nntmux\db\DbUpdate; diff --git a/app/extensions/command/Update.php b/app/extensions/command/Update.php index c874c8b82..7746590f3 100644 --- a/app/extensions/command/Update.php +++ b/app/extensions/command/Update.php @@ -6,11 +6,11 @@ * Time: 15.17 */ -namespace app\extensions\command; +namespace App\extensions\command; -use app\extensions\console\Command; -use app\extensions\util\Git; -use app\extensions\util\Versions; +use App\extensions\console\Command; +use App\extensions\util\Git; +use App\extensions\util\Versions; use nntmux\db\DbUpdate; use Symfony\Component\Process\Process; diff --git a/app/extensions/command/Verify.php b/app/extensions/command/Verify.php index 9115b24a7..f5d93535c 100644 --- a/app/extensions/command/Verify.php +++ b/app/extensions/command/Verify.php @@ -16,10 +16,10 @@ * @author niel * @copyright 2016 nZEDb */ -namespace app\extensions\command; +namespace App\extensions\command; -use app\models\Settings; -use lithium\console\command\Help; +use App\extensions\console\Command; +use App\models\Settings; /** @@ -28,7 +28,7 @@ use lithium\console\command\Help; * Actions: * * settings_table Checks that all settings in the 10~settings.tsv exist in your Db. */ -class Verify extends \app\extensions\console\Command +class Verify extends Command { /** * Constructor. diff --git a/app/extensions/command/Version.php b/app/extensions/command/Version.php index 7751f88e5..b1266d262 100644 --- a/app/extensions/command/Version.php +++ b/app/extensions/command/Version.php @@ -17,10 +17,10 @@ * @copyright 2016 nZEDb */ -namespace app\extensions\command; +namespace App\extensions\command; -use app\extensions\console\Command; -use \app\extensions\util\Versions; +use App\extensions\console\Command; +use App\extensions\util\Versions; /** diff --git a/app/extensions/console/Command.php b/app/extensions/console/Command.php index 4e238b99c..9e99334d3 100755 --- a/app/extensions/console/Command.php +++ b/app/extensions/console/Command.php @@ -18,7 +18,7 @@ * @author niel * @copyright 2014 nZEDb */ -namespace app\extensions\console; +namespace App\extensions\console; use Symfony\Component\Console\Output\ConsoleOutput; diff --git a/app/extensions/util/Git.php b/app/extensions/util/Git.php index a313710fa..60bf3e4bb 100644 --- a/app/extensions/util/Git.php +++ b/app/extensions/util/Git.php @@ -16,7 +16,7 @@ * @author niel * @copyright 2016 nZEDb */ -namespace app\extensions\util; +namespace App\extensions\util; use \GitRepo; use Illuminate\Database\Eloquent\Collection; diff --git a/app/extensions/util/Versions.php b/app/extensions/util/Versions.php index bc06008aa..d6b25c3a3 100644 --- a/app/extensions/util/Versions.php +++ b/app/extensions/util/Versions.php @@ -16,9 +16,9 @@ * @author niel * @copyright 2016 nZEDb */ -namespace app\extensions\util; +namespace App\extensions\util; -use app\models\Settings; +use App\models\Settings; use Illuminate\Database\Eloquent\Collection; use nntmux\utility\Utility; diff --git a/app/extensions/util/Yenc.php b/app/extensions/util/Yenc.php index dcd063f03..a7500b1d8 100644 --- a/app/extensions/util/Yenc.php +++ b/app/extensions/util/Yenc.php @@ -17,10 +17,10 @@ * @copyright 2016 nZEDb */ -namespace app\extensions\util; +namespace App\extensions\util; use Illuminate\Support\ServiceProvider; -use app\extensions\util\yenc\adapter\NzedbYenc; +use App\extensions\util\yenc\adapter\NzedbYenc; class Yenc extends ServiceProvider { diff --git a/app/extensions/util/yenc/adapter/NzedbYenc.php b/app/extensions/util/yenc/adapter/NzedbYenc.php index 2b156854e..6586e2a23 100644 --- a/app/extensions/util/yenc/adapter/NzedbYenc.php +++ b/app/extensions/util/yenc/adapter/NzedbYenc.php @@ -17,7 +17,7 @@ * @copyright 2016 nZEDb */ -namespace app\extensions\util\yenc\adapter; +namespace App\extensions\util\yenc\adapter; use Illuminate\Support\ServiceProvider; use yenc\yenc; diff --git a/app/models/MultigroupPosters.php b/app/models/MultigroupPosters.php index 920dce706..8f589703a 100644 --- a/app/models/MultigroupPosters.php +++ b/app/models/MultigroupPosters.php @@ -16,7 +16,7 @@ * @author niel * @copyright 2016 nZEDb */ -namespace app\models; +namespace App\models; use Illuminate\Database\Eloquent\Model; diff --git a/app/models/ReleaseRegexes.php b/app/models/ReleaseRegexes.php index 20e87f298..8bdfd6cb4 100644 --- a/app/models/ReleaseRegexes.php +++ b/app/models/ReleaseRegexes.php @@ -16,7 +16,7 @@ * @author DariusIII * @copyright 2017 NNTmux/nZEDb */ -namespace app\models; +namespace App\models; use Illuminate\Database\Eloquent\Model; diff --git a/app/models/ReleasesGroups.php b/app/models/ReleasesGroups.php index eeebbbe08..0d265b648 100644 --- a/app/models/ReleasesGroups.php +++ b/app/models/ReleasesGroups.php @@ -16,7 +16,7 @@ * @author niel * @copyright 2016 nZEDb */ -namespace app\models; +namespace App\models; use Illuminate\Database\Eloquent\Model; diff --git a/app/models/Settings.php b/app/models/Settings.php index f772abdf8..ec7ac4487 100644 --- a/app/models/Settings.php +++ b/app/models/Settings.php @@ -17,11 +17,11 @@ * @copyright 2016 nZEDb */ -namespace app\models; +namespace App\models; use Illuminate\Database\Eloquent\Model; use nntmux\utility\Utility; -use app\extensions\console\Command; +use App\extensions\console\Command; /** * Settings - model for settings table. diff --git a/app/models/SteamApps.php b/app/models/SteamApps.php index 20322fbc0..42291f7b6 100644 --- a/app/models/SteamApps.php +++ b/app/models/SteamApps.php @@ -16,7 +16,7 @@ * @author DariusIII * @copyright 2016 NNTmux/nZEDb */ -namespace app\models; +namespace App\models; use Illuminate\Database\Eloquent\Model; diff --git a/build/git-hooks/runHooks.php b/build/git-hooks/runHooks.php index 9b5debce2..f26e3e2c8 100755 --- a/build/git-hooks/runHooks.php +++ b/build/git-hooks/runHooks.php @@ -23,7 +23,7 @@ define('GIT_PRE_COMMIT', true); require_once realpath(dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'bootstrap.php'); use nntmux\utility\Git; -use app\extensions\util\Versions; +use App\extensions\util\Versions; echo "Running pre-commit hooks\n"; diff --git a/composer.json b/composer.json index 9dd65ae9d..1f6f7d2b3 100755 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "psr-4": { "nntmux\\": "nntmux/", - "app\\": "app/" + "App\\": "app/" }, "classmap": [ "www/pages/", diff --git a/misc/testing/DB/convert_to_tpg.php b/misc/testing/DB/convert_to_tpg.php index 3f3230fa7..cacd9ebc8 100644 --- a/misc/testing/DB/convert_to_tpg.php +++ b/misc/testing/DB/convert_to_tpg.php @@ -1,7 +1,7 @@ require_once dirname(__DIR__, 2) . DIRECTORY_SEPARATOR . 'bootstrap.php'; -use app\models\Settings; +use App\models\Settings; use nntmux\db\DB; use nntmux\NZB; diff --git a/misc/update/nix/multiprocessing/.do_not_run/switch.php b/misc/update/nix/multiprocessing/.do_not_run/switch.php index 31d585ad4..f7020ef54 100644 --- a/misc/update/nix/multiprocessing/.do_not_run/switch.php +++ b/misc/update/nix/multiprocessing/.do_not_run/switch.php @@ -6,7 +6,7 @@ if (!isset($argv[1])) { require_once dirname(__DIR__, 5) . DIRECTORY_SEPARATOR . 'bootstrap.php'; -use app\models\Settings; +use App\models\Settings; use \nntmux\db\DB; use \nntmux\processing\PostProcess; use \nntmux\processing\ProcessReleases; diff --git a/misc/update/nix/tmux/bin/groupfixrelnames.php b/misc/update/nix/tmux/bin/groupfixrelnames.php index fd85d66be..247776c3d 100644 --- a/misc/update/nix/tmux/bin/groupfixrelnames.php +++ b/misc/update/nix/tmux/bin/groupfixrelnames.php @@ -1,7 +1,7 @@ users->isLoggedIn()) $page->show403(); diff --git a/www/pages/api.php b/www/pages/api.php index 26052b2b3..a04947904 100644 --- a/www/pages/api.php +++ b/www/pages/api.php @@ -1,6 +1,6 @@ users->isLoggedIn()) { diff --git a/www/pages/getnzb.php b/www/pages/getnzb.php index 8a6feb8c6..3bfd90b21 100644 --- a/www/pages/getnzb.php +++ b/www/pages/getnzb.php @@ -1,6 +1,6 @@ title = "Terms and Conditions"; $page->meta_title = Settings::value('site.main.title')." - Terms and conditions";