fix few issues

Author: ArthurHlt

README.md

@@ -84,8 +84,30 @@ With `cf-helper-php` you can say that you are in development and app will do the
 
 Simulate CloudFoundry environment
 ---------------------------------
+You can half simulate a CloudFoudry environment by using a `manifest.yml`, your environment variable from manifest will be set in `$_ENV`.
+You can also add simulate service by adding a key called `serviceSimulate` in your `manifest.yml`, example:
+
+```yml
+#manifest.yml
+---
+#manifest
+applications:
+  - name: test
+    memory: 1G
+    env:
+      MYAPP_APP_DIR: /home/vcap/app
+      MYAPP_LOGS_DIR: /logs_dir
+serviceSimulate:
+  DATABASE: {"host": "localhost", "username": "jojo", "password": "toto", "port": "3306"} # a service database will be accessible, prefer writing with {'key": 'value'} to simplify your cups command
+```
 
-
+To run CloudFoundry simulation simply do:
+```php
+<?php
+$cfHelper->simulateCloudFoundry(); //it use manifest.yml which is in the same folder where this script is called
+//to set another manifest.yml:
+$cfHelper->simulateCloudFoundry("your_manifest.yml);
+```
 
 
 

src/orange/cfhelper/configuration/PhpIniConfigurator.php

@@ -85,12 +85,9 @@ public function loadConfig()
     public function loadIniConfig()
     {
         $arrayValues = array();
-        try {
-
-            $servicePhpIni = $this->serviceManager->getService(PhpIniConfigurator::$servicePhpIniName . '-' . $this->applicationInfo->getName());
+        $servicePhpIni = $this->serviceManager->getService(PhpIniConfigurator::$servicePhpIniName . '-' . $this->applicationInfo->getName());
+        if ($servicePhpIni != null) {
             $arrayValues = $servicePhpIni->getValues();
-        } catch (\Exception $e) {
-
         }
         if (is_file(__DIR__ . '/../../../../../../../composer.json')) {
             $composerJson = json_decode(file_get_contents(__DIR__ . '/../../../../../../../composer.json'), true);

src/orange/cfhelper/services/PopulatorCloudFoundry.php

@@ -37,19 +37,18 @@ class PopulatorCloudFoundry extends Populator
     function __construct()
     {
         parent::__construct();
-        $this->vcapServices = json_decode($_ENV['VCAP_SERVICES'], true);
-        if (empty($this->vcapServices)) {
-            $this->vcapServices = array();
-        }
     }
 
     /**
      * @param $name
      * @return null|Service
-     * @throws \Exception
      */
     public function getService($name)
     {
+        $this->vcapServices = json_decode($_ENV['VCAP_SERVICES'], true);
+        if (empty($this->vcapServices)) {
+            $this->vcapServices = array();
+        }
         if (!empty($this->services[$name])) {
             return $this->services[$name];
         }
@@ -61,7 +60,7 @@ public function getService($name)
         if (!empty($service)) {
             return $service;
         }
-        throw new \Exception("Service $name cannot be found.");
+        return null;
     }
 
     /**
@@ -101,6 +100,9 @@ private function getServiceInside($name)
     {
         foreach ($this->vcapServices as $serviceFirstName => $services) {
             foreach ($services as $service) {
+                if (empty($service['name'])) {
+                    continue;
+                }
                 if (preg_match('#^' . $name . '$#i', $service['name'])) {
                     return $this->makeService($service);
                 }

src/orange/cfhelper/simulator/CloudFoundrySimulator.php

@@ -95,7 +95,7 @@ public static function loadService($manifestYml)
                 "tags" => array(),
                 "credentials" => $serviceCredentials
             );
-            $serviceUserProvided = array("user-provided" => $service);
+            $serviceUserProvided = array(array("user-provided" => $service));
             CloudFoundrySimulator::loadVarEnv(array(self::KEY_SERVICE => json_encode($serviceUserProvided)));
         }
     }