Merge pull request #136 from magento/MAGECLOUD-5112

shiftedreality · web-flow · commit e24b8ca78cfb · 2020-02-03T13:54:13.000-06:00
MAGECLOUD-5112: Add pcov php extension support into cloud docker
diff --git a/LICENSE_MIT.txt b/LICENSE_MIT.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Meanbee
+Copyright (c) Meanbee and Taylor Otwell
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/composer.json b/composer.json
@@ -13,7 +13,6 @@
         "composer/composer": "^1.0",
         "composer/semver": "^1.0",
         "illuminate/config": "^5.5",
-        "illuminate/filesystem": "^5.5",
         "symfony/config": "^4.4",
         "symfony/console": "^2.8||^4.0",
         "symfony/dependency-injection": "^3.3||^4.3",
diff --git a/config/services.xml b/config/services.xml
@@ -16,10 +16,10 @@
         </service>
         <service id="Magento\CloudDocker\Filesystem\DirectoryList" autowire="false"/>
         <service id="Magento\CloudDocker\Filesystem\FilesystemException" autowire="false"/>
+        <service id="Magento\CloudDocker\Filesystem\FileNotFoundException" autowire="false"/>
         <service id="Magento\CloudDocker\Compose\DeveloperBuilder" shared="false"/>
         <service id="Magento\CloudDocker\Compose\ProductionBuilder" shared="false"/>
         <service id="Magento\CloudDocker\Compose\FunctionalBuilder" shared="false"/>
-        <service id="Illuminate\Filesystem\Filesystem"/>
         <service id="Composer\Semver\VersionParser"/>
         <service id="Composer\Semver\Semver"/>
     </services>
diff --git a/images/php/7.1-cli/Dockerfile b/images/php/7.1-cli/Dockerfile
@@ -115,6 +115,7 @@ RUN pecl install -o -f \
   mailparse \
   msgpack \
   oauth \
+  pcov \
   propro \
   raphf \
   redis \
@@ -160,6 +161,7 @@ RUN docker-php-ext-enable \
   mysqli \
   oauth \
   opcache \
+  pcov \
   pdo_mysql \
   propro \
   pspell \
@@ -185,6 +187,7 @@ RUN docker-php-ext-enable \
 
 ADD etc/php-cli.ini /usr/local/etc/php/conf.d/zz-magento.ini
 ADD etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
+ADD etc/php-pcov.ini /usr/local/etc/php/conf.d/zz-pcov-settings.ini
 ADD etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
 
 # Get composer installed to /usr/local/bin/composer
diff --git a/images/php/7.1-cli/etc/php-pcov.ini b/images/php/7.1-cli/etc/php-pcov.ini
@@ -0,0 +1,2 @@
+pcov.enabled=1
+pcov.directory=/app
diff --git a/images/php/7.1-fpm/Dockerfile b/images/php/7.1-fpm/Dockerfile
@@ -94,6 +94,7 @@ RUN pecl install -o -f \
   mailparse \
   msgpack \
   oauth \
+  pcov \
   propro \
   raphf \
   redis \
@@ -139,6 +140,7 @@ RUN docker-php-ext-enable \
   mysqli \
   oauth \
   opcache \
+  pcov \
   pdo_mysql \
   propro \
   pspell \
@@ -166,6 +168,7 @@ RUN groupadd -g 1000 www && useradd -g 1000 -u 1000 -d ${MAGENTO_ROOT} -s /bin/b
 
 COPY etc/php-fpm.ini /usr/local/etc/php/conf.d/zz-magento.ini
 COPY etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
+COPY etc/php-pcov.ini /usr/local/etc/php/conf.d/zz-pcov-settings.ini
 COPY etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
 COPY etc/php-fpm.conf /usr/local/etc/
 
diff --git a/images/php/7.1-fpm/etc/php-pcov.ini b/images/php/7.1-fpm/etc/php-pcov.ini
@@ -0,0 +1,2 @@
+pcov.enabled=1
+pcov.directory=/app
diff --git a/images/php/7.2-cli/Dockerfile b/images/php/7.2-cli/Dockerfile
@@ -113,6 +113,7 @@ RUN pecl install -o -f \
   mailparse \
   msgpack \
   oauth \
+  pcov \
   propro \
   raphf \
   redis \
@@ -160,6 +161,7 @@ RUN docker-php-ext-enable \
   mysqli \
   oauth \
   opcache \
+  pcov \
   pdo_mysql \
   propro \
   pspell \
@@ -185,6 +187,7 @@ RUN docker-php-ext-enable \
 
 ADD etc/php-cli.ini /usr/local/etc/php/conf.d/zz-magento.ini
 ADD etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
+ADD etc/php-pcov.ini /usr/local/etc/php/conf.d/zz-pcov-settings.ini
 ADD etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
 
 # Get composer installed to /usr/local/bin/composer
diff --git a/images/php/7.2-cli/etc/php-pcov.ini b/images/php/7.2-cli/etc/php-pcov.ini
@@ -0,0 +1,2 @@
+pcov.enabled=1
+pcov.directory=/app
diff --git a/images/php/7.2-fpm/Dockerfile b/images/php/7.2-fpm/Dockerfile
@@ -92,6 +92,7 @@ RUN pecl install -o -f \
   mailparse \
   msgpack \
   oauth \
+  pcov \
   propro \
   raphf \
   redis \
@@ -139,6 +140,7 @@ RUN docker-php-ext-enable \
   mysqli \
   oauth \
   opcache \
+  pcov \
   pdo_mysql \
   propro \
   pspell \
@@ -166,6 +168,7 @@ RUN groupadd -g 1000 www && useradd -g 1000 -u 1000 -d ${MAGENTO_ROOT} -s /bin/b
 
 COPY etc/php-fpm.ini /usr/local/etc/php/conf.d/zz-magento.ini
 COPY etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
+COPY etc/php-pcov.ini /usr/local/etc/php/conf.d/zz-pcov-settings.ini
 COPY etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
 COPY etc/php-fpm.conf /usr/local/etc/
 
diff --git a/images/php/7.2-fpm/etc/php-pcov.ini b/images/php/7.2-fpm/etc/php-pcov.ini
@@ -0,0 +1,2 @@
+pcov.enabled=1
+pcov.directory=/app
diff --git a/images/php/7.3-cli/Dockerfile b/images/php/7.3-cli/Dockerfile
@@ -111,6 +111,7 @@ RUN pecl install -o -f \
   mailparse \
   msgpack \
   oauth \
+  pcov \
   propro \
   raphf \
   redis \
@@ -157,6 +158,7 @@ RUN docker-php-ext-enable \
   mysqli \
   oauth \
   opcache \
+  pcov \
   pdo_mysql \
   propro \
   pspell \
@@ -181,6 +183,7 @@ RUN docker-php-ext-enable \
 
 ADD etc/php-cli.ini /usr/local/etc/php/conf.d/zz-magento.ini
 ADD etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
+ADD etc/php-pcov.ini /usr/local/etc/php/conf.d/zz-pcov-settings.ini
 ADD etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
 
 # Get composer installed to /usr/local/bin/composer
diff --git a/images/php/7.3-cli/etc/php-pcov.ini b/images/php/7.3-cli/etc/php-pcov.ini
@@ -0,0 +1,2 @@
+pcov.enabled=1
+pcov.directory=/app
diff --git a/images/php/7.3-fpm/Dockerfile b/images/php/7.3-fpm/Dockerfile
@@ -90,6 +90,7 @@ RUN pecl install -o -f \
   mailparse \
   msgpack \
   oauth \
+  pcov \
   propro \
   raphf \
   redis \
@@ -136,6 +137,7 @@ RUN docker-php-ext-enable \
   mysqli \
   oauth \
   opcache \
+  pcov \
   pdo_mysql \
   propro \
   pspell \
@@ -162,6 +164,7 @@ RUN groupadd -g 1000 www && useradd -g 1000 -u 1000 -d ${MAGENTO_ROOT} -s /bin/b
 
 COPY etc/php-fpm.ini /usr/local/etc/php/conf.d/zz-magento.ini
 COPY etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
+COPY etc/php-pcov.ini /usr/local/etc/php/conf.d/zz-pcov-settings.ini
 COPY etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
 COPY etc/php-fpm.conf /usr/local/etc/
 
diff --git a/images/php/7.3-fpm/etc/php-pcov.ini b/images/php/7.3-fpm/etc/php-pcov.ini
@@ -0,0 +1,2 @@
+pcov.enabled=1
+pcov.directory=/app
diff --git a/images/php/cli/Dockerfile b/images/php/cli/Dockerfile
@@ -42,6 +42,7 @@ RUN npm install -g grunt-cli
 
 ADD etc/php-cli.ini /usr/local/etc/php/conf.d/zz-magento.ini
 ADD etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
+ADD etc/php-pcov.ini /usr/local/etc/php/conf.d/zz-pcov-settings.ini
 ADD etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
 
 # Get composer installed to /usr/local/bin/composer
diff --git a/images/php/cli/etc/php-pcov.ini b/images/php/cli/etc/php-pcov.ini
@@ -0,0 +1,2 @@
+pcov.enabled=1
+pcov.directory=/app
diff --git a/images/php/fpm/Dockerfile b/images/php/fpm/Dockerfile
@@ -34,6 +34,7 @@ RUN groupadd -g 1000 www && useradd -g 1000 -u 1000 -d ${MAGENTO_ROOT} -s /bin/b
 
 COPY etc/php-fpm.ini /usr/local/etc/php/conf.d/zz-magento.ini
 COPY etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
+COPY etc/php-pcov.ini /usr/local/etc/php/conf.d/zz-pcov-settings.ini
 COPY etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
 COPY etc/php-fpm.conf /usr/local/etc/
 
diff --git a/images/php/fpm/etc/php-pcov.ini b/images/php/fpm/etc/php-pcov.ini
@@ -0,0 +1,2 @@
+pcov.enabled=1
+pcov.directory=/app
diff --git a/src/Command/BuildCompose.php b/src/Command/BuildCompose.php
@@ -7,7 +7,7 @@
 
 namespace Magento\CloudDocker\Command;
 
-use Illuminate\Filesystem\Filesystem;
+use Magento\CloudDocker\Filesystem\Filesystem;
 use Magento\CloudDocker\App\GenericException;
 use Magento\CloudDocker\Compose\DeveloperBuilder;
 use Magento\CloudDocker\Compose\BuilderFactory;
diff --git a/src/Command/Image/GeneratePhp.php b/src/Command/Image/GeneratePhp.php
@@ -8,9 +8,9 @@
 namespace Magento\CloudDocker\Command\Image;
 
 use Composer\Semver\Semver;
-use Illuminate\Contracts\Filesystem\FileNotFoundException;
-use Illuminate\Filesystem\Filesystem;
 use Magento\CloudDocker\App\ConfigurationMismatchException;
+use Magento\CloudDocker\Filesystem\FileNotFoundException;
+use Magento\CloudDocker\Filesystem\Filesystem;
 use Magento\CloudDocker\Compose\Php\ExtensionResolver;
 use Magento\CloudDocker\Filesystem\DirectoryList;
 use Symfony\Component\Console\Command\Command;
diff --git a/src/Compose/Php/ExtensionResolver.php b/src/Compose/Php/ExtensionResolver.php
@@ -255,6 +255,9 @@ public static function getConfig(): array
                     self::EXTENSION_CONFIGURE_OPTIONS => ['--enable-opcache'],
                 ],
             ],
+            'pcov' => [
+                '>=7.0' => [self::EXTENSION_TYPE => self::EXTENSION_TYPE_PECL],
+            ],
             'pdo_mysql' => [
                 '>=7.0' => [self::EXTENSION_TYPE => self::EXTENSION_TYPE_CORE],
             ],
diff --git a/src/Config/Application/Reader.php b/src/Config/Application/Reader.php
@@ -7,7 +7,8 @@
 
 namespace Magento\CloudDocker\Config\Application;
 
-use Illuminate\Filesystem\Filesystem;
+use Magento\CloudDocker\Filesystem\FileNotFoundException;
+use Magento\CloudDocker\Filesystem\Filesystem;
 use Magento\CloudDocker\Filesystem\FileList;
 use Magento\CloudDocker\Filesystem\FilesystemException;
 use Symfony\Component\Yaml\Yaml;
@@ -50,7 +51,7 @@ public function read(): array
             $servicesConfig = Yaml::parse(
                 $this->filesystem->get($this->fileList->getServicesConfig())
             );
-        } catch (\Exception $exception) {
+        } catch (FileNotFoundException $exception) {
             throw new FilesystemException($exception->getMessage(), $exception->getCode(), $exception);
         }
 
@@ -74,7 +75,7 @@ public function read(): array
         ];
 
         foreach ($appConfig['relationships'] as $constraint) {
-            list($name) = explode(':', $constraint);
+            [$name] = explode(':', $constraint);
 
             if (!isset($servicesConfig[$name]['type'])) {
                 throw new FilesystemException(sprintf(
@@ -83,7 +84,7 @@ public function read(): array
                 ));
             }
 
-            list($service, $version) = explode(':', $servicesConfig[$name]['type']);
+            [$service, $version] = explode(':', $servicesConfig[$name]['type']);
 
             if (array_key_exists($service, $config['services'])) {
                 throw new FilesystemException(sprintf(
diff --git a/src/Config/Dist/Generator.php b/src/Config/Dist/Generator.php
@@ -7,8 +7,8 @@
 
 namespace Magento\CloudDocker\Config\Dist;
 
-use Illuminate\Filesystem\Filesystem;
 use Magento\CloudDocker\App\ConfigurationMismatchException;
+use Magento\CloudDocker\Filesystem\Filesystem;
 use Magento\CloudDocker\Config\Relationship;
 use Magento\CloudDocker\Filesystem\DirectoryList;
 
diff --git a/src/Config/Environment/Shared/Reader.php b/src/Config/Environment/Shared/Reader.php
@@ -7,8 +7,8 @@
 
 namespace Magento\CloudDocker\Config\Environment\Shared;
 
-use Illuminate\Contracts\Filesystem\FileNotFoundException;
-use Illuminate\Filesystem\Filesystem;
+use Magento\CloudDocker\Filesystem\FileNotFoundException;
+use Magento\CloudDocker\Filesystem\Filesystem;
 use Magento\CloudDocker\Config\ReaderInterface;
 use Magento\CloudDocker\Filesystem\DirectoryList;
 use Magento\CloudDocker\Filesystem\FilesystemException;
diff --git a/src/Filesystem/FileNotFoundException.php b/src/Filesystem/FileNotFoundException.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CloudDocker\Filesystem;
+
+use Magento\CloudDocker\App\GenericException;
+
+/**
+ * Exception for missing file.
+ */
+class FileNotFoundException extends GenericException
+{
+}
diff --git a/src/Filesystem/Filesystem.php b/src/Filesystem/Filesystem.php
diff --git a/src/Test/Unit/Config/Application/ReaderTest.php b/src/Test/Unit/Config/Application/ReaderTest.php
diff --git a/src/Test/Unit/Config/Dist/GeneratorTest.php b/src/Test/Unit/Config/Dist/GeneratorTest.php
diff --git a/src/Test/Unit/Config/Environment/Shared/ReaderTest.php b/src/Test/Unit/Config/Environment/Shared/ReaderTest.php

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+pcov.enabled=1`
	`2`	`+pcov.directory=/app`