MAGECLOUD-1045: Prepare infrastructure for integration tests (#35)

Author: shiftedreality

.travis.yml

@@ -1,16 +1,32 @@
 sudo: false
 dist: trusty
-
+services:
+  - mysql
 language: php
 php:
   - 7.0
   - 7.1
 env:
   global:
     - COMPOSER_BIN_DIR=~/bin
+  matrix:
+    - TEST_SUITE=static
+    - TEST_SUITE=unit
+    - TEST_SUITE=integration
+matrix:
+  exclude:
+    - php: 7.1
+      env: TEST_SUITE=integration
 cache:
   apt: true
   directories:
     - $HOME/.composer/cache
-install: composer install --no-interaction --prefer-dist
-script: composer test
+install:
+  - composer install --no-interaction
+before_install:
+  - mysql -e 'CREATE DATABASE IF NOT EXISTS integration_tests;'
+script:
+  - if [ $TEST_SUITE == "static" ]; then phpcs src --standard=tests/static/phpcs-ruleset.xml -p -n; fi;
+  - if [ $TEST_SUITE == "static" ]; then phpmd src xml tests/static/phpmd-ruleset.xml; fi;
+  - if [ $TEST_SUITE == "unit" ]; then phpunit --configuration tests/unit/phpunit.xml.dist; fi;
+  - if [ $TEST_SUITE == "integration" ]; then phpunit --configuration tests/integration/phpunit.xml.dist; fi;

composer.json

@@ -3,8 +3,8 @@
   "description": "Provides tools to build and deploy Magento 2 Enterprise Edition",
   "version": "2002.0",
   "license": [
-      "OSL-3.0",
-      "AFL-3.0"
+    "OSL-3.0",
+    "AFL-3.0"
   ],
   "require": {
     "php": "^7.0",
@@ -13,7 +13,8 @@
     "illuminate/container": "^5.5",
     "psr/log": "^1.0",
     "psr/container": "^1.0",
-    "composer/composer": "@stable"
+    "composer/composer": "@stable",
+    "composer/semver": "^1.4"
   },
   "require-dev": {
     "phpunit/phpunit": "~6.2.0",
@@ -22,8 +23,11 @@
     "phpmd/phpmd": "@stable",
     "php-mock/php-mock-phpunit": "^2.0"
   },
-  "bin":[
-    "m2-ece-build", "m2-ece-deploy", "m2-ece-scd-dump", "bin/ece-tools"
+  "bin": [
+    "m2-ece-build",
+    "m2-ece-deploy",
+    "m2-ece-scd-dump",
+    "bin/ece-tools"
   ],
   "autoload": {
     "psr-4": {
@@ -32,10 +36,11 @@
   },
   "scripts": {
     "test": [
-      "phpunit src",
-      "phpcs src --standard=phpcs-ruleset.xml -p -n",
-      "phpmd src xml phpmd-ruleset.xml"
+      "phpcs src --standard=tests/static/phpcs-ruleset.xml -p -n",
+      "phpmd src xml tests/static/phpmd-ruleset.xml",
+      "phpunit --configuration tests/unit/phpunit.xml.dist"
     ]
   },
+  "process-timeout": 600,
   "prefer-stable": true
 }

phpunit.xml.dist

@@ -56,7 +56,8 @@ public function __construct(string $root, array $config)
         $this->singleton(\Magento\MagentoCloud\Config\Build::class);
         $this->singleton(\Magento\MagentoCloud\Config\Deploy::class);
         $this->singleton(\Psr\Log\LoggerInterface::class, $this->createLogger('default'));
-        $this->singleton(\Magento\MagentoCloud\Util\ComponentInfo::class);
+        $this->singleton(\Magento\MagentoCloud\Package\Manager::class);
+        $this->singleton(\Magento\MagentoCloud\Package\MagentoVersion::class);
         $this->singleton(\Magento\MagentoCloud\Util\UrlManager::class);
         $this->singleton(
             \Magento\MagentoCloud\DB\ConnectionInterface::class,
@@ -104,7 +105,6 @@ public function __construct(string $root, array $config)
                         $this->make(DeployProcess\InstallUpdate\Install\Setup::class),
                         $this->make(DeployProcess\InstallUpdate\Install\SecureAdmin::class),
                         $this->make(DeployProcess\InstallUpdate\ConfigUpdate::class),
-                        $this->make(DeployProcess\InstallUpdate\Install\ImportDeploymentConfig::class),
                     ],
                 ]);
             });

src/Magento/MagentoCloud/App/Container.php

@@ -27,11 +27,10 @@ class Application extends \Symfony\Component\Console\Application
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
-        $composer = $container->get(Composer::class);
 
         parent::__construct(
-            $composer->getPackage()->getPrettyName(),
-            $composer->getPackage()->getPrettyVersion()
+            $container->get(Composer::class)->getPackage()->getPrettyName(),
+            $container->get(Composer::class)->getPackage()->getPrettyVersion()
         );
     }
 

src/Magento/MagentoCloud/Application.php

@@ -17,6 +17,8 @@
  */
 class Build extends Command
 {
+    const NAME = 'build';
+
     /**
      * @var ProcessInterface
      */
@@ -46,7 +48,7 @@ public function __construct(
      */
     protected function configure()
     {
-        $this->setName('build')
+        $this->setName(static::NAME)
             ->setDescription('Builds application');
 
         parent::configure();

src/Magento/MagentoCloud/Command/Build.php

@@ -17,6 +17,8 @@
  */
 class Deploy extends Command
 {
+    const NAME = 'deploy';
+
     /**
      * @var ProcessInterface
      */
@@ -44,7 +46,7 @@ public function __construct(ProcessInterface $process, LoggerInterface $logger)
      */
     protected function configure()
     {
-        $this->setName('deploy')
+        $this->setName(static::NAME)
             ->setDescription('Deploys application');
 
         parent::configure();

src/Magento/MagentoCloud/Command/Deploy.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MagentoCloud\Package;
+
+use Composer\Semver\Comparator;
+
+class MagentoVersion
+{
+    /**
+     * @var Manager
+     */
+    private $manager;
+
+    /**
+     * @var Comparator
+     */
+    private $comparator;
+
+    /**
+     * @param Manager $manager
+     * @param Comparator $comparator
+     */
+    public function __construct(Manager $manager, Comparator $comparator)
+    {
+        $this->manager = $manager;
+        $this->comparator = $comparator;
+    }
+
+    /**
+     * @param string $version
+     * @return bool
+     */
+    public function isGreaterOrEqual(string $version): bool
+    {
+        $package = $this->manager->get('magento/magento2-base');
+
+        return $this->comparator::compare($package->getVersion(), '>=', $version);
+    }
+}

src/Magento/MagentoCloud/Package/MagentoVersion.php

@@ -3,25 +3,32 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\MagentoCloud\Util;
+namespace Magento\MagentoCloud\Package;
 
 use Composer\Composer;
 use Composer\Package\PackageInterface;
+use Composer\Repository\RepositoryInterface;
 
-class ComponentInfo
+class Manager
 {
     /**
      * @var Composer
      */
     private $composer;
 
+    /**
+     * @var RepositoryInterface
+     */
+    private $repository;
+
     /**
      * @param Composer $composer
      */
     public function __construct(
         Composer $composer
     ) {
         $this->composer = $composer;
+        $this->repository = $composer->getLocker()->getLockedRepository();
     }
 
     /**
@@ -30,13 +37,11 @@ public function __construct(
      * @param array $packages The array of packages names
      * @return string
      */
-    public function get(array $packages = ['magento/ece-tools', 'magento/magento2-base']): string
+    public function getPrettyInfo(array $packages = ['magento/ece-tools', 'magento/magento2-base']): string
     {
-        $repository = $this->composer->getLocker()->getLockedRepository();
-
         $versions = [];
         foreach ($packages as $packageName) {
-            $package = $repository->findPackage($packageName, '*');
+            $package = $this->repository->findPackage($packageName, '*');
             if ($package instanceof PackageInterface) {
                 $versions[] = sprintf(
                     '%s version: %s',
@@ -48,4 +53,21 @@ public function get(array $packages = ['magento/ece-tools', 'magento/magento2-ba
 
         return '(' . implode(', ', $versions) . ')';
     }
+
+    /**
+     * @param string $packageName
+     * @param string $version
+     * @return PackageInterface
+     * @throws \Exception
+     */
+    public function get(string $packageName, string $version = '*'): PackageInterface
+    {
+        $package = $this->repository->findPackage($packageName, $version);
+
+        if (!$package instanceof PackageInterface) {
+            throw new \Exception('Package was not found');
+        }
+
+        return $package;
+    }
 }

src/Magento/MagentoCloud/Util/ComponentInfo.php renamed to src/Magento/MagentoCloud/Package/Manager.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\MagentoCloud\Process\Build;
 
+use Magento\MagentoCloud\Package\MagentoVersion;
 use Magento\MagentoCloud\Process\ProcessInterface;
 use Magento\MagentoCloud\Shell\ShellInterface;
 use Psr\Log\LoggerInterface;
@@ -24,14 +25,24 @@ class ApplyPatches implements ProcessInterface
      */
     private $logger;
 
+    /**
+     * @var MagentoVersion
+     */
+    private $magentoVersion;
+
     /**
      * @param ShellInterface $shell
      * @param LoggerInterface $logger
+     * @param MagentoVersion $magentoVersion
      */
-    public function __construct(ShellInterface $shell, LoggerInterface $logger)
-    {
+    public function __construct(
+        ShellInterface $shell,
+        LoggerInterface $logger,
+        MagentoVersion $magentoVersion
+    ) {
         $this->shell = $shell;
         $this->logger = $logger;
+        $this->magentoVersion = $magentoVersion;
     }
 
     /**
@@ -42,7 +53,9 @@ public function execute()
         $this->logger->info('Applying patches.');
 
         try {
-            $this->shell->execute('php vendor/bin/m2-apply-patches');
+            if ($this->magentoVersion->isGreaterOrEqual('2.2')) {
+                $this->shell->execute('php vendor/bin/m2-apply-patches');
+            }
         } catch (\Exception $exception) {
             $this->logger->warning('Patching was failed. Skipping.');
         }