Merge pull request #57 from phpdocker-io/php-7.1

Add Php 7.1 beta support

Author: luispabon

composer.lock

@@ -78,15 +78,34 @@ public function createAction(Request $request)
      * @param Project $project
      *
      * @return Project
+     * @throws \InvalidArgumentException
      */
     private function fixPhpExtensionGeneratorExpectation(Project $project) : Project
     {
-        if ($project->getPhpOptions()->getVersion() === PhpOptions::PHP_VERSION_56) {
-            $project->getPhpOptions()->setPhpExtensions($project->getPhpOptions()->getPhpExtensions56());
-        } else {
-            $project->getPhpOptions()->setPhpExtensions($project->getPhpOptions()->getPhpExtensions70());
+        /** @var PhpOptions $phpOptions */
+        $phpOptions = $project->getPhpOptions();
+        $phpVersion = $phpOptions->getVersion();
+
+        switch ($phpVersion) {
+            case PhpOptions::PHP_VERSION_56:
+                $extensions = $phpOptions->getPhpExtensions56();
+                break;
+
+            case PhpOptions::PHP_VERSION_70:
+                $extensions = $phpOptions->getPhpExtensions70();
+                break;
+
+            case PhpOptions::PHP_VERSION_71:
+                $extensions = $phpOptions->getPhpExtensions71();
+                break;
+
+            default:
+                throw new \InvalidArgumentException(sprintf('Eek! Unsupported php version %s', $phpVersion));
+
         }
 
+        $project->getPhpOptions()->setPhpExtensions($extensions);
+
         return $project;
     }
 }

src/AppBundle/Controller/GeneratorController.php

@@ -51,6 +51,19 @@ class PhpOptions extends \PHPDocker\Project\ServiceOptions\Php
      */
     protected $phpExtensions70 = [];
 
+
+    /**
+     * This does not exist on parent project. Needs to be redirected to $phpExtensions
+     * based on version.
+     *
+     * @var array
+     *
+     * @Assert\All({
+     *     @Assert\NotBlank
+     * })
+     */
+    protected $phpExtensions71 = [];
+
     /**
      * @return array
      */
@@ -67,6 +80,22 @@ public function setPhpExtensions70(array $phpExtensions70 = [])
         $this->phpExtensions70 = $phpExtensions70;
     }
 
+    /**
+     * @return array
+     */
+    public function getPhpExtensions71()
+    {
+        return $this->phpExtensions71;
+    }
+
+    /**
+     * @param array $phpExtensions71
+     */
+    public function setPhpExtensions71(array $phpExtensions71 = [])
+    {
+        $this->phpExtensions71 = $phpExtensions71;
+    }
+
     /**
      * @return array
      */