Skip to content

Commit 1a2a2a6

Browse files
committed
Move Config to Salient\Core and rename Facade to AbstractFacade
1 parent fe73534 commit 1a2a2a6

File tree

18 files changed

+43
-43
lines changed

18 files changed

+43
-43
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
/phpstan* export-ignore
99
/phpunit* export-ignore
1010
/scripts export-ignore
11+
/src/Toolkit/Core/Facade/Config.php linguist-generated
1112
/src/Util/Cli/CliOptionBuilder.php linguist-generated
1213
/src/Util/Curler/CurlerBuilder.php linguist-generated
1314
/src/Util/Curler/Support/CurlerPageBuilder.php linguist-generated
1415
/src/Util/Facade/App.php linguist-generated
1516
/src/Util/Facade/Cache.php linguist-generated
16-
/src/Util/Facade/Config.php linguist-generated
1717
/src/Util/Facade/Console.php linguist-generated
1818
/src/Util/Facade/Err.php linguist-generated
1919
/src/Util/Facade/Event.php linguist-generated

lk-util/Command/Generate/GenerateFacade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Lkrms\Support\PhpDoc\PhpDoc;
1010
use Lkrms\Utility\Arr;
1111
use Lkrms\Utility\Reflect;
12-
use Salient\Core\Facade;
12+
use Salient\Core\AbstractFacade;
1313
use ReflectionMethod;
1414
use ReflectionParameter;
1515

@@ -127,7 +127,7 @@ protected function run(string ...$args)
127127
$classPrefix = $this->getClassPrefix();
128128

129129
$service = $this->getFqcnAlias($classFqcn, $classClass);
130-
$extends = $this->getFqcnAlias(Facade::class);
130+
$extends = $this->getFqcnAlias(AbstractFacade::class);
131131

132132
$alias = [];
133133
foreach ($aliasFqcn as $aliasFqcn) {

scripts/generate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Lkrms\Curler\CurlerBuilder;
1515
use Lkrms\Facade\App;
1616
use Lkrms\Facade\Cache;
17-
use Lkrms\Facade\Config;
1817
use Lkrms\Facade\Console;
1918
use Lkrms\Facade\Err;
2019
use Lkrms\Facade\Event;
@@ -58,6 +57,7 @@
5857
use Lkrms\Utility\Json;
5958
use Lkrms\Utility\Package;
6059
use Lkrms\Utility\Pcre;
60+
use Salient\Core\Facade\Config;
6161
use Salient\Core\ConfigurationManager;
6262

6363
require dirname(__DIR__) . '/vendor/autoload.php';

src/Toolkit/Core/Facade.php renamed to src/Toolkit/Core/AbstractFacade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*
2525
* @implements FacadeInterface<TService>
2626
*/
27-
abstract class Facade implements FacadeInterface
27+
abstract class AbstractFacade implements FacadeInterface
2828
{
2929
/** @use ResolvesServiceLists<TService> */
3030
use ResolvesServiceLists;

src/Util/Facade/Config.php renamed to src/Toolkit/Core/Facade/Config.php

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Util/Container/Application.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use Lkrms\Exception\FilesystemErrorException;
1010
use Lkrms\Exception\InvalidEnvironmentException;
1111
use Lkrms\Facade\Cache;
12-
use Lkrms\Facade\Config;
1312
use Lkrms\Facade\Console;
1413
use Lkrms\Facade\Err;
1514
use Lkrms\Facade\Profile;
@@ -27,6 +26,7 @@
2726
use Lkrms\Utility\Pcre;
2827
use Lkrms\Utility\Sys;
2928
use Lkrms\Utility\Test;
29+
use Salient\Core\Facade\Config;
3030
use LogicException;
3131
use Phar;
3232

src/Util/Facade/App.php

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Util/Facade/Cache.php

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Util/Facade/Console.php

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Util/Facade/Err.php

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)