Added automatic version detecion

Author: phiamo

DependencyInjection/Compiler/FormPass.php

@@ -27,6 +27,10 @@ class FormPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         if (($template = $container->getParameter('mopa_bootstrap.form.templating')) !== false) {
+            if(strpos($template, "%d") !== false){
+                $version = $container->getParameter('mopa_bootstrap.version');
+                $template = sprintf($template, $version); 
+            }
             $resources = $container->getParameter('twig.form.resources');
             # Ensure it wasnt already aded via config
             if (!in_array($template, $resources)) {                

DependencyInjection/Compiler/VersionPass.php

@@ -5,21 +5,51 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Mopa\Bridge\Composer\Adapter\ComposerAdapter;
 use Mopa\Bridge\Composer\Util\ComposerPathFinder;
+use Symfony\Component\Config\ConfigCache;
+use Symfony\Component\Config\Resource\FileResource;
 
 
 class VersionPass implements CompilerPassInterface
 {
+    /**
+     * Fetch bootstrap version from composer and cache result!
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasParameter('mopa_bootstrap.version') || is_null($container->hasParameter('mopa_bootstrap.version'))) {
-            /*if (false !== $composer = ComposerAdapter::getComposer()) {
-                $util = new ComposerPathFinder($composer);
-                $package = $util->findPackage("twbs/bootstrap");
-                $version = split("-", $package->getVersion());
-                $container->setParameter('mopa_bootstrap.version', floatVal($version[0]));
-            } else {
-                throw new \RuntimeException("Could not find composer and mopa_bootstrap.version not set in config!!");
-            }*/
+
+
+            $cachePath = $container->getParameter('kernel.cache_dir').'/mopa_bootstrap_version.cache';
+
+            // the second argument indicates whether or not you want to use debug mode
+            $versionCache = new ConfigCache($cachePath, $container->getParameter("kernel.debug"));
+
+            if (!$versionCache->isFresh()) {
+                // make sure this also works for we requests !
+                $oldWorkingDir = getcwd();
+                $split = explode(DIRECTORY_SEPARATOR, $oldWorkingDir);
+                if ( $split[count($split)-1] == "web") {
+                    array_pop($split);
+                    chdir(implode(DIRECTORY_SEPARATOR, $split));
+                }
+                putenv("COMPOSER_HOME=".getcwd());
+                
+                if (false !== $composer = ComposerAdapter::getComposer()) {
+                    $util = new ComposerPathFinder($composer);
+                    $package = $util->findPackage("twbs/bootstrap");
+                    $version = split("-", $package->getVersion());
+                    $targetPackagePath = $composer->getInstallationManager()->getInstallPath($package);
+                    $twbscomposer = $targetPackagePath ."/composer.json";
+                     
+                    $resources = array(new FileResource($twbscomposer));
+
+                    $versionCache->write($version[0], $resources);   
+                } else {
+                    throw new \RuntimeException("Could not find composer and mopa_bootstrap.version not set in config!!");
+                }
+            }
+            $version = file_get_contents($cachePath);
+            $container->setParameter('mopa_bootstrap.version', floatVal($version));
         }
     }
 }

DependencyInjection/Configuration.php

@@ -43,6 +43,7 @@ protected function addVersionConfig(ArrayNodeDefinition $rootNode)
             ->children()
                 ->scalarNode('version')
                     ->defaultValue(null)
+                    ->cannotBeEmpty()
             ->end();
     }
     protected function addFormConfig(ArrayNodeDefinition $rootNode)
@@ -53,7 +54,7 @@ protected function addFormConfig(ArrayNodeDefinition $rootNode)
                     ->addDefaultsIfNotSet()
                     ->children()
                         ->scalarNode('templating')
-                            ->defaultValue("MopaBootstrapBundle:Form:fields.html.twig")
+                            ->defaultValue("MopaBootstrapBundle:Form:fields_bs_%d.html.twig")
                             ->end()
                         ->scalarNode('horizontal_label_class')
                             ->defaultValue("col-3")

DependencyInjection/MopaBootstrapExtension.php

@@ -32,8 +32,14 @@ public function load(array $configs, ContainerBuilder $container)
         $config = $this->processConfiguration($configuration, $configs);
 
         $yamlloader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $yamlloader->load("form_extensions.yml");
+        if(!isset($config['version'])){
+            #throw new \RuntimeException("You need to specify mopa_bootstrap.version!");
+        }
+        else{
+            $container->setParameter('mopa_bootstrap.version', $config['version']);
+        }
         $yamlloader->load('twig_extensions.yml');
+        $yamlloader->load("form_extensions.yml");
 
         if (isset($config['form'])) {
             foreach ($config['form'] as $key => $value) {

MopaBootstrapBundle.php

@@ -13,9 +13,8 @@ class MopaBootstrapBundle extends Bundle
     public function build(ContainerBuilder $container)
     {
         parent::build($container);
-
+        $container->addCompilerPass(new VersionPass());
         $container->addCompilerPass(new FormPass());
         $container->addCompilerPass(new NavbarPass());
-        $container->addCompilerPass(new VersionPass());
     }
 }

Resources/doc/1-installation.md

@@ -208,7 +208,14 @@ Installation
     }
     ```
 
-3. If you like configure your config.yml (not mandatory)
+3. You need to set the bootstrap version until we get composer working (mandatory!)
+
+    ``` yaml
+    mopa_bootstrap:
+        version: 3 # bootstrap major version currently only 2 or 3 are supported!
+    ```
+    
+4. If you like further tweak your config.yml (not mandatory)
 
     ``` yaml
     mopa_bootstrap: