Remove services.yaml and define services directly in PHP

[MAILPOET-1605]

lib/DI/ContainerFactory.php

@@ -20,8 +20,13 @@ class ContainerFactory {
 
   static function createContainer() {
     self::$container = new ContainerBuilder();
-    $loader = new YamlFileLoader(self::$container, new FileLocator(__DIR__));
+    self::$container->autowire(\MailPoet\Config\AccessControl::class);
-    $loader->load('services.yml');
+    self::$container->autowire(\MailPoet\Cron\Daemon::class);
+    self::$container->autowire(\MailPoet\Cron\DaemonHttpRunner::class);
+    self::$container->autowire(\MailPoet\Router\Endpoints\CronDaemon::class);
+    self::$container->autowire(\MailPoet\Router\Endpoints\Subscription::class);
+    self::$container->autowire(\MailPoet\Router\Endpoints\Track::class);
+    self::$container->autowire(\MailPoet\Router\Endpoints\ViewInBrowser::class);
     return self::$container;
   }
 }

lib/DI/services.yml

@@ -1,26 +0,0 @@
-parameters:
-
-services:
-  _defaults:
-    autowire: true
-
-  MailPoet\Config\AccessControl:
-    class: MailPoet\Config\AccessControl
-
-  MailPoet\Cron\Daemon:
-    class: MailPoet\Cron\Daemon
-
-  MailPoet\Cron\DaemonHttpRunner:
-    class: MailPoet\Cron\DaemonHttpRunner
-
-  MailPoet\Router\Endpoints\CronDaemon:
-    class: MailPoet\Router\Endpoints\CronDaemon
-
-  MailPoet\Router\Endpoints\Subscription:
-    class: MailPoet\Router\Endpoints\Subscription
-
-  MailPoet\Router\Endpoints\Track:
-    class: MailPoet\Router\Endpoints\Track
-
-  MailPoet\Router\Endpoints\ViewInBrowser:
-    class: MailPoet\Router\Endpoints\ViewInBrowser

mozart/composer.json

@@ -9,7 +9,6 @@
     "php": ">=5.5",
     "symfony/dependency-injection": "3.4.17",
     "symfony/config": "3.4.17",
-    "symfony/yaml": "3.4.17",
     "monolog/monolog": "^1.23",
     "coenjacobs/mozart": "dev-dependency-tree"
   },
@@ -41,10 +40,5 @@
         "symfony/dependency-injection"
       ]
     }
-  },
-  "config": {
-    "platform": {
-      "php": "5.6.30"
-    }
   }
 }

mozart/composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "03a34a82665735879d60040ecc56d106",
+    "content-hash": "b1d5ff6371e4e69fedf30c37692ca610",
     "packages": [
         {
             "name": "coenjacobs/mozart",
@@ -446,32 +446,32 @@
         },
         {
             "name": "symfony/debug",
-            "version": "v3.4.17",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "0a612e9dfbd2ccce03eb174365f31ecdca930ff6"
+                "reference": "e3f76ce6198f81994e019bb2b4e533e9de1b9b90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/0a612e9dfbd2ccce03eb174365f31ecdca930ff6",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/e3f76ce6198f81994e019bb2b4e533e9de1b9b90",
-                "reference": "0a612e9dfbd2ccce03eb174365f31ecdca930ff6",
+                "reference": "e3f76ce6198f81994e019bb2b4e533e9de1b9b90",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
+                "php": "^7.1.3",
                 "psr/log": "~1.0"
             },
             "conflict": {
-                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+                "symfony/http-kernel": "<3.4"
             },
             "require-dev": {
-                "symfony/http-kernel": "~2.8|~3.0|~4.0"
+                "symfony/http-kernel": "~3.4|~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -498,7 +498,7 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2018-10-02T16:33:53+00:00"
+            "time": "2018-10-02T16:36:10+00:00"
         },
         {
             "name": "symfony/dependency-injection",
@@ -573,26 +573,26 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v3.4.17",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "d69930fc337d767607267d57c20a7403d0a822a4"
+                "reference": "596d12b40624055c300c8b619755b748ca5cf0b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/d69930fc337d767607267d57c20a7403d0a822a4",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/596d12b40624055c300c8b619755b748ca5cf0b5",
-                "reference": "d69930fc337d767607267d57c20a7403d0a822a4",
+                "reference": "596d12b40624055c300c8b619755b748ca5cf0b5",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
+                "php": "^7.1.3",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -619,7 +619,7 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2018-10-02T12:28:39+00:00"
+            "time": "2018-10-02T12:40:59+00:00"
         },
         {
             "name": "symfony/finder",
@@ -786,65 +786,6 @@
                 "shim"
             ],
             "time": "2018-08-06T14:22:27+00:00"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v3.4.17",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "640b6c27fed4066d64b64d5903a86043f4a4de7f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/640b6c27fed4066d64b64d5903a86043f4a4de7f",
-                "reference": "640b6c27fed4066d64b64d5903a86043f4a4de7f",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "conflict": {
-                "symfony/console": "<3.4"
-            },
-            "require-dev": {
-                "symfony/console": "~3.4|~4.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-10-02T16:33:53+00:00"
         }
     ],
     "packages-dev": [],
@@ -858,8 +799,5 @@
     "platform": {
         "php": ">=5.5"
     },
-    "platform-dev": [],
+    "platform-dev": []
-    "platform-overrides": {
-        "php": "5.6.30"
-    }
 }