Disabling blackfire by default. Will be enabled automatically in compose when added to .magento.app.yaml config

Author: Igor Vitol

src/Command/BuildCompose.php

@@ -252,11 +252,6 @@ protected function configure(): void
             null,
             InputOption::VALUE_NONE,
             'Enables XDebug'
-        )->addOption(
-            Source\CliSource::OPTION_WITHOUT_BLACKFIRE,
-            null,
-            InputOption::VALUE_NONE,
-            'Do not load blackfire php extension by default'
         )->addOption(
             Source\CliSource::OPTION_ENV_VARIABLES,
             null,

src/Compose/Php/ExtensionResolver.php

@@ -46,8 +46,7 @@ class ExtensionResolver
         'sysvsem',
         'sysvshm',
         'opcache',
-        'zip',
-        'blackfire'
+        'zip'
     ];
 
     /**

src/Config/Source/CliSource.php

@@ -53,7 +53,6 @@ class CliSource implements SourceInterface
     public const OPTION_NO_TMP_MOUNTS = 'no-tmp-mounts';
     public const OPTION_SYNC_ENGINE = 'sync-engine';
     public const OPTION_WITH_XDEBUG = 'with-xdebug';
-    public const OPTION_WITHOUT_BLACKFIRE = 'without-blackfire';
     public const OPTION_SET_DOCKER_HOST_XDEBUG = 'set-docker-host';
     public const OPTION_WITH_ENTRYPOINT = 'with-entrypoint';
     public const OPTION_WITH_MARIADB_CONF = 'with-mariadb-conf';
@@ -145,7 +144,6 @@ public function __construct(InputInterface $input)
     public function read(): Repository
     {
         $repository = new Repository();
-        $disabledExtensions = [];
 
         if ($mode = $this->input->getOption(self::OPTION_MODE)) {
             $repository->set([
@@ -240,10 +238,6 @@ public function read(): Repository
             ]);
         }
 
-        if ($this->input->getOption(self::OPTION_WITHOUT_BLACKFIRE)) {
-            $disabledExtensions['blackfire'] = 'blackfire';
-        }
-
         if ($this->input->getOption(self::OPTION_SET_DOCKER_HOST_XDEBUG)) {
             $repository->set(self::SYSTEM_SET_DOCKER_HOST, true);
         }
@@ -316,7 +310,6 @@ public function read(): Repository
             $repository->set(self::SYSTEM_NGINX_WORKER_CONNECTIONS, $nginxWorkerConnections);
         }
 
-        $repository->set(self::PHP_DISABLED_EXTENSIONS, $disabledExtensions);
         return $repository;
     }
 }

src/Test/Integration/BuildComposeTest.php

@@ -87,7 +87,6 @@ public function buildDataProvider(): array
                     [CliSource::OPTION_WITH_TEST, true],
                     [CliSource::OPTION_WITH_CRON, true],
                     [CliSource::OPTION_WITH_XDEBUG, true],
-                    [CliSource::OPTION_WITHOUT_BLACKFIRE, true],
                     [CliSource::OPTION_ES, '5.2'],
                     [CliSource::OPTION_NO_ES, true],
                     [CliSource::OPTION_DB_INCREMENT_INCREMENT, 3],
@@ -107,7 +106,6 @@ public function buildDataProvider(): array
                     [CliSource::OPTION_WITH_TEST, true],
                     [CliSource::OPTION_WITH_CRON, true],
                     [CliSource::OPTION_WITH_XDEBUG, true],
-                    [CliSource::OPTION_WITHOUT_BLACKFIRE, true],
                     [CliSource::OPTION_ES, '5.2'],
                     [CliSource::OPTION_NO_ES, true],
                     [CliSource::OPTION_DB_INCREMENT_INCREMENT, 3],

src/Test/Integration/_files/cloud_base/docker-compose.exp.yml

@@ -127,7 +127,7 @@ services:
     image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
     env_file: ./.docker/config.env
     environment:
-      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip blackfire redis xsl sodium'
+      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip redis xsl sodium'
   build:
     hostname: build.magento2.docker
     image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'

src/Test/Integration/_files/custom_cloud_base/docker-compose.exp.yml

@@ -101,7 +101,7 @@ services:
     image: 'magento/magento-cloud-docker-php:7.2-cli-1.2.0'
     env_file: ./.docker/config.env
     environment:
-      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip blackfire xsl'
+      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl'
   build:
     hostname: build.magento2.test
     image: 'magento/magento-cloud-docker-php:7.2-cli-1.2.0'

src/Test/Integration/_files/custom_cloud_custom_images/docker-compose.exp.yml

@@ -152,7 +152,7 @@ services:
     image: 'php-v1:7.4-cli'
     env_file: ./.docker/config.env
     environment:
-      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip blackfire xsl'
+      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl'
   build:
     hostname: build.magento2.test
     image: 'php-v1:7.4-cli'