Merge pull request #7075 from nupplaphil/task/move_console_namespace

Move Console namespace one level up

src/Console/ArchiveContact.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;

src/Console/AutomaticInstallation.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Asika\SimpleConsole\Console;
 use Friendica\BaseObject;

src/Console/Cache.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
 use Friendica\App;

src/Console/Config.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
 use Friendica\App;

src/Console/CreateDoxygen.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 /**
  * Description of CreateDoxygen

src/Console/DatabaseStructure.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Friendica\Core;
 use Friendica\Core\Update;

src/Console/DocBloxErrorChecker.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 /**
  * When I installed docblox, I had the experience that it does not generate any output at all.

src/Console/Extract.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 /**
  * Extracts translation strings from the Friendica project's files to be exported

src/Console/GlobalCommunityBlock.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Friendica\Core\L10n;
 use Friendica\Model\Contact;

src/Console/GlobalCommunitySilence.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;

src/Console/Maintenance.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Friendica\Core;
 

src/Console/NewPassword.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;

src/Console/PhpToPo.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 /**
  * Read a strings.php file and create messages.po in the same directory

src/Console/PoToPhp.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 /**
  * Read a messages.po file and create strings.php in the same directory

src/Console/PostUpdate.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Friendica\Core\Config;
 use Friendica\Core\L10n;

src/Console/ServerBlock.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
 use Asika\SimpleConsole\Console;

src/Console/Storage.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
 use Friendica\Core\StorageManager;

src/Console/Typo.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Friendica\BaseObject;
 

src/Core/Console.php

@@ -2,6 +2,8 @@
 
 namespace Friendica\Core;
 
+use Friendica;
+
 /**
  * Description of Console
  *
@@ -47,24 +49,24 @@ HELP;
 	}
 
 	protected $subConsoles = [
-		'cache'                  => __NAMESPACE__ . '\Console\Cache',
-		'config'                 => __NAMESPACE__ . '\Console\Config',
-		'createdoxygen'          => __NAMESPACE__ . '\Console\CreateDoxygen',
-		'docbloxerrorchecker'    => __NAMESPACE__ . '\Console\DocBloxErrorChecker',
-		'dbstructure'            => __NAMESPACE__ . '\Console\DatabaseStructure',
-		'extract'                => __NAMESPACE__ . '\Console\Extract',
-		'globalcommunityblock'   => __NAMESPACE__ . '\Console\GlobalCommunityBlock',
-		'globalcommunitysilence' => __NAMESPACE__ . '\Console\GlobalCommunitySilence',
-		'archivecontact'         => __NAMESPACE__ . '\Console\ArchiveContact',
-		'autoinstall'            => __NAMESPACE__ . '\Console\AutomaticInstallation',
-		'maintenance'            => __NAMESPACE__ . '\Console\Maintenance',
-		'newpassword'            => __NAMESPACE__ . '\Console\NewPassword',
-		'php2po'                 => __NAMESPACE__ . '\Console\PhpToPo',
-		'po2php'                 => __NAMESPACE__ . '\Console\PoToPhp',
-		'typo'                   => __NAMESPACE__ . '\Console\Typo',
-		'postupdate'             => __NAMESPACE__ . '\Console\PostUpdate',
-		'serverblock'            => __NAMESPACE__ . '\Console\ServerBlock',
-		'storage'                => __NAMESPACE__ . '\Console\Storage',
+		'cache'                  => Friendica\Console\Cache::class,
+		'config'                 => Friendica\Console\Config::class,
+		'createdoxygen'          => Friendica\Console\CreateDoxygen::class,
+		'docbloxerrorchecker'    => Friendica\Console\DocBloxErrorChecker::class,
+		'dbstructure'            => Friendica\Console\DatabaseStructure::class,
+		'extract'                => Friendica\Console\Extract::class,
+		'globalcommunityblock'   => Friendica\Console\GlobalCommunityBlock::class,
+		'globalcommunitysilence' => Friendica\Console\GlobalCommunitySilence::class,
+		'archivecontact'         => Friendica\Console\ArchiveContact::class,
+		'autoinstall'            => Friendica\Console\AutomaticInstallation::class,
+		'maintenance'            => Friendica\Console\Maintenance::class,
+		'newpassword'            => Friendica\Console\NewPassword::class,
+		'php2po'                 => Friendica\Console\PhpToPo::class,
+		'po2php'                 => Friendica\Console\PoToPhp::class,
+		'typo'                   => Friendica\Console\Typo::class,
+		'postupdate'             => Friendica\Console\PostUpdate::class,
+		'serverblock'            => Friendica\Console\ServerBlock::class,
+		'storage'                => Friendica\Console\Storage::class,
 	];
 
 	protected function doExecute()

tests/src/Console/AutomaticInstallationConsoleTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Friendica\Test\src\Core\Console;
+namespace Friendica\Test\src\Console;
 
+use Friendica\Console\AutomaticInstallation;
 use Friendica\Core\Config\Cache\ConfigCache;
-use Friendica\Core\Console\AutomaticInstallation;
 use Friendica\Core\Installer;
 use Friendica\Core\Logger;
 use Friendica\Test\Util\DBAMockTrait;

tests/src/Console/ConfigConsoleTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Friendica\Test\src\Core\Console;
+namespace Friendica\Test\src\Console;
 
 use Friendica\App\Mode;
-use Friendica\Core\Console\Config;
+use Friendica\Console\Config;
 
 /**
  * @runTestsInSeparateProcesses
@@ -116,7 +116,7 @@ class ConfigConsoleTest extends ConsoleTest
 		$executable = $this->consoleArgv[0];
 		$assertion = <<<CONF
 Executable: {$executable}
-Class: Friendica\Core\Console\Config
+Class: Friendica\Console\Config
 Arguments: array (
   0 => 'test',
   1 => 'it',

tests/src/Console/ConsoleTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Test\src\Core\Console;
+namespace Friendica\Test\src\Console;
 
 use Asika\SimpleConsole\Console;
 use Friendica\Test\MockedTest;

tests/src/Console/ServerBlockConsoleTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Friendica\Test\src\Core\Console;
+namespace Friendica\Test\src\Console;
 
-use Friendica\Core\Console\ServerBlock;
+use Friendica\Console\ServerBlock;
 
 /**
  * @runTestsInSeparateProcesses