Skip to content

Commit aa67a25

Browse files
bbatschebillygilbert
bbatsche
authored and
billygilbert
committed
MAGECLOUD-4979: Cleanup Composer Dependencies (magento#664)
MAGECLOUD-4979: Cleanup Composer Dependencies (magento#664)
1 parent e954a58 commit aa67a25

File tree

3 files changed

+48
-44
lines changed

3 files changed

+48
-44
lines changed

‎composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
"composer/semver": "^1.4",
2020
"graylog2/gelf-php": "^1.4.2",
2121
"guzzlehttp/guzzle": "^6.2",
22-
"illuminate/config": "^5.6",
22+
"illuminate/config": "^5.5",
2323
"magento/magento-cloud-components": "^1.0.1",
2424
"magento/magento-cloud-docker": "^1.0.0",
2525
"magento/magento-cloud-patches": "^1.0.0",
2626
"monolog/monolog": "^1.16",
2727
"nesbot/carbon": "^1.0||^2.0",
2828
"psr/container": "^1.0",
2929
"psr/log": "^1.0",
30-
"symfony/config": "^3.4||^4.3",
31-
"symfony/console": "^2.3||^4.0",
32-
"symfony/dependency-injection": "^3.4||^4.3",
30+
"symfony/config": "^4.4",
31+
"symfony/console": "^2.8||^4.0",
32+
"symfony/dependency-injection": "^3.3||^4.3",
3333
"symfony/process": "^2.1||^4.1",
34-
"symfony/serializer": "^3.3",
34+
"symfony/serializer": "^2.8||^3.3",
3535
"symfony/yaml": "^3.3||^4.0"
3636
},
3737
"require-dev": {

‎config/services.xml

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,55 @@
44
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
55

66
<services>
7-
<defaults autowire="true" autoconfigure="true" public="true">
8-
<bind key="int $errorLevel">300</bind>
9-
</defaults>
7+
<defaults autowire="true" autoconfigure="true" public="true" />
108
<!-- ... -->
9+
1110
<prototype namespace="Magento\MagentoCloud\" resource="../src/*" exclude="../src/{Test}"/>
1211

1312
<service id="Composer\Package\Version\VersionParser" autowire="false" />
14-
<service id="Magento\MagentoCloud\Filesystem\SystemList" autowire="false" />
15-
<service id="Magento\MagentoCloud\Step\Build\DeployStaticContent" autowire="false" />
13+
<service id="Composer\Semver\Comparator"/>
14+
<service id="Composer\Semver\Semver"/>
15+
<service id="Composer\Semver\VersionParser"/>
16+
<service id="Illuminate\Config\Repository"/>
1617
<service id="Magento\MagentoCloud\App\Container" autowire="false" />
18+
<service id="Magento\MagentoCloud\App\ContainerInterface" alias="container" />
1719
<service id="Magento\MagentoCloud\App\GenericException" autowire="false" />
1820
<service id="Magento\MagentoCloud\App\Logger\Gelf\Handler" autowire="false" />
19-
<service id="Magento\MagentoCloud\App\Container" autowire="false" />
21+
<service id="Magento\MagentoCloud\Config\AdminDataInterface" alias="Magento\MagentoCloud\Config\AdminData" />
22+
<service id="Magento\MagentoCloud\Config\EnvironmentDataInterface" alias="Magento\MagentoCloud\Config\EnvironmentData" />
23+
<service id="Magento\MagentoCloud\Config\Environment\ReaderInterface" alias="Magento\MagentoCloud\Config\Environment\Reader" />
24+
<service id="Magento\MagentoCloud\Config\Magento\Env\ReaderInterface" alias="Magento\MagentoCloud\Config\Magento\Env\Reader" />
25+
<service id="Magento\MagentoCloud\Config\Magento\Env\WriterInterface" alias="Magento\MagentoCloud\Config\Magento\Env\Writer" />
26+
<service id="Magento\MagentoCloud\Config\Magento\Shared\ReaderInterface" alias="Magento\MagentoCloud\Config\Magento\Shared\Reader" />
27+
<service id="Magento\MagentoCloud\Config\Magento\Shared\WriterInterface" alias="Magento\MagentoCloud\Config\Magento\Shared\Writer" />
28+
<service id="Magento\MagentoCloud\Config\Stage\BuildInterface" alias="Magento\MagentoCloud\Config\Stage\Build" />
29+
<service id="Magento\MagentoCloud\Config\Stage\DeployInterface" alias="Magento\MagentoCloud\Config\Stage\Deploy" />
30+
<service id="Magento\MagentoCloud\Config\Stage\PostDeployInterface" alias="Magento\MagentoCloud\Config\Stage\PostDeploy" />
31+
<service id="Magento\MagentoCloud\Config\Validator\Deploy\ServiceEol" autowire="false" />
2032
<service id="Magento\MagentoCloud\Config\Validator\Result\Error" autowire="false" />
2133
<service id="Magento\MagentoCloud\DB\Data\Connection" autowire="false" />
2234
<service id="Magento\MagentoCloud\DB\Data\RelationshipConnection" autowire="false" />
2335
<service id="Magento\MagentoCloud\DB\PDOException" autowire="false" />
36+
<service id="Magento\MagentoCloud\Filesystem\FileSystemException" autowire="false" />
2437
<service id="Magento\MagentoCloud\Filesystem\Flag\ConfigurationMismatchException" autowire="false" />
38+
<service id="Magento\MagentoCloud\Filesystem\Flag\Pool">
39+
<argument type="collection">
40+
<argument key="regenerate">var/.regenerate</argument>
41+
<argument key="scd_in_build">.static_content_deploy</argument>
42+
<argument key="deploy_is_failed">var/.deploy_is_failed</argument>
43+
</argument>
44+
</service>
45+
<service id="Magento\MagentoCloud\Filesystem\SystemList" autowire="false" />
46+
<service id="Magento\MagentoCloud\Package\UndefinedPackageException" autowire="false" />
47+
<service id="Magento\MagentoCloud\PlatformVariable\DecoderInterface" alias="Magento\MagentoCloud\PlatformVariable\Decoder" />
2548
<service id="Magento\MagentoCloud\Scenario\Exception\ProcessorException" autowire="false" />
2649
<service id="Magento\MagentoCloud\Scenario\Exception\ValidationException" autowire="false" />
27-
<service id="Magento\MagentoCloud\Filesystem\FileSystemException" autowire="false" />
28-
<service id="Magento\MagentoCloud\Package\UndefinedPackageException" autowire="false" />
50+
<service id="Magento\MagentoCloud\Service\ServiceMismatchException" autowire="false" />
51+
<service id="Magento\MagentoCloud\Shell\Process" autowire="false" />
52+
<service id="Magento\MagentoCloud\Shell\ProcessException" autowire="false" />
53+
<service id="Magento\MagentoCloud\Shell\ShellInterface" alias="Magento\MagentoCloud\Shell\Shell" />
54+
<service id="Magento\MagentoCloud\Step\Build\BackupData" autowire="false" />
55+
<service id="Magento\MagentoCloud\Step\Build\DeployStaticContent" autowire="false" />
2956
<service id="Magento\MagentoCloud\Step\Deploy\DeployCompletion" autowire="false" />
3057
<service id="Magento\MagentoCloud\Step\Deploy\DeployStaticContent" autowire="false" />
3158
<service id="Magento\MagentoCloud\Step\Deploy\InstallUpdate" autowire="false" />
@@ -34,40 +61,17 @@
3461
<service id="Magento\MagentoCloud\Step\SkipStep" autowire="false" />
3562
<service id="Magento\MagentoCloud\Step\StepException" autowire="false" />
3663
<service id="Magento\MagentoCloud\Step\ValidateConfiguration" autowire="false" />
37-
<service id="Magento\MagentoCloud\Step\Build\BackupData" autowire="false" />
38-
<service id="Magento\MagentoCloud\Service\ServiceMismatchException" autowire="false" />
39-
<service id="Magento\MagentoCloud\Shell\Process" autowire="false" />
40-
<service id="Magento\MagentoCloud\Shell\ProcessException" autowire="false" />
41-
<service id="Magento\MagentoCloud\Filesystem\Flag\Pool">
42-
<argument type="collection">
43-
<argument key="regenerate">var/.regenerate</argument>
44-
<argument key="scd_in_build">.static_content_deploy</argument>
45-
<argument key="deploy_is_failed">var/.deploy_is_failed</argument>
64+
<service id="Psr\Log\LoggerInterface" alias="Magento\MagentoCloud\App\Logger" />
65+
<service id="ServiceEol.Warnings" class="Magento\MagentoCloud\Config\Validator\Deploy\ServiceEol">
66+
<argument key="$errorLevel" type="constant">
67+
Magento\MagentoCloud\Config\ValidatorInterface::LEVEL_WARNING
4668
</argument>
4769
</service>
48-
<service id="ServiceEol.Warnings" class="Magento\MagentoCloud\Config\Validator\Deploy\ServiceEol" />
4970
<service id="ServiceEol.Notices" class="Magento\MagentoCloud\Config\Validator\Deploy\ServiceEol">
50-
<bind key="int $errorLevel">250</bind>
71+
<argument key="$errorLevel" type="constant">
72+
Magento\MagentoCloud\Config\ValidatorInterface::LEVEL_NOTICE
73+
</argument>
5174
</service>
52-
<service id="Composer\Package\Version\VersionParser"/>
53-
<service id="Composer\Semver\VersionParser"/>
54-
<service id="Composer\Semver\Semver"/>
55-
<service id="Composer\Semver\Comparator"/>
56-
<service id="Illuminate\Config\Repository"/>
5775
<service id="Symfony\Component\Serializer\Encoder\XmlEncoder"/>
58-
<service id="Psr\Log\LoggerInterface" alias="Magento\MagentoCloud\App\Logger" />
59-
<service id="Magento\MagentoCloud\App\ContainerInterface" alias="container" />
60-
<service id="Magento\MagentoCloud\Shell\ShellInterface" alias="Magento\MagentoCloud\Shell\Shell" />
61-
<service id="Magento\MagentoCloud\Config\Stage\DeployInterface" alias="Magento\MagentoCloud\Config\Stage\Deploy" />
62-
<service id="Magento\MagentoCloud\Config\Stage\BuildInterface" alias="Magento\MagentoCloud\Config\Stage\Build" />
63-
<service id="Magento\MagentoCloud\Config\Stage\PostDeployInterface" alias="Magento\MagentoCloud\Config\Stage\PostDeploy" />
64-
<service id="Magento\MagentoCloud\Config\EnvironmentDataInterface" alias="Magento\MagentoCloud\Config\EnvironmentData" />
65-
<service id="Magento\MagentoCloud\Config\AdminDataInterface" alias="Magento\MagentoCloud\Config\AdminData" />
66-
<service id="Magento\MagentoCloud\PlatformVariable\DecoderInterface" alias="Magento\MagentoCloud\PlatformVariable\Decoder" />
67-
<service id="Magento\MagentoCloud\Config\Environment\ReaderInterface" alias="Magento\MagentoCloud\Config\Environment\Reader" />
68-
<service id="Magento\MagentoCloud\Config\Magento\Env\ReaderInterface" alias="Magento\MagentoCloud\Config\Magento\Env\Reader" />
69-
<service id="Magento\MagentoCloud\Config\Magento\Env\WriterInterface" alias="Magento\MagentoCloud\Config\Magento\Env\Writer" />
70-
<service id="Magento\MagentoCloud\Config\Magento\Shared\ReaderInterface" alias="Magento\MagentoCloud\Config\Magento\Shared\Reader" />
71-
<service id="Magento\MagentoCloud\Config\Magento\Shared\WriterInterface" alias="Magento\MagentoCloud\Config\Magento\Shared\Writer" />
7276
</services>
7377
</container>

‎src/App/Container.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Container implements ContainerInterface
3939
public function __construct(string $toolsBasePath, string $magentoBasePath)
4040
{
4141
$containerBuilder = new ContainerBuilder();
42-
$containerBuilder->set('container', $containerBuilder);
42+
$containerBuilder->set('container', $this);
4343
$containerBuilder->setDefinition('container', new Definition(Container::class))
4444
->setArguments([$toolsBasePath, $magentoBasePath]);
4545

0 commit comments

Comments
 (0)