1.0.8

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "phenyxdigitale/coredev",
-    "description": "Ephenyx Digital Core Developpement",  
+    "description": "Deploy Ephenyx Digital Core",  
     "homepage": "https://github.com/phenyxdigitale/coredev",
     "type": "library",
     "license": "MIT",
@@ -20,6 +20,9 @@
     },  
 	"autoload": {
 		"classmap": {"digitalCore": "src/"},
-        "files": ["digitalcore.composer.php"]
+        "files": ["digitalcore.composer.php"],
+        "psr-4": {
+            "phenyxDigitale\\digitalCore\\": "digitalCore"
+        }
 	}
 }

src/Controller/PhenyxController.php → digitalCore/PhenyxController.php

@@ -1,11 +1,9 @@
 <?php
 
-use Ephenyxdigital\Core\DependencyInjection\ServiceLocator;
-use Ephenyxdigital\Core\Error\ErrorHandler;
-use Ephenyxdigital\Core\Error\ErrorUtils;
+namespace PhenyxDigital\digitalCore;
 
 /**
- * Class ControllerCore
+ * Class PhenyxController
  *
  * @since 1.6.6.3
  */
@@ -119,8 +117,7 @@ public function __construct() {
 
     public static function getController($className, $auth = false, $ssl = false) {
 
-        Tools::displayAsDeprecated();
-        return ServiceLocator::getInstance()->getController($className);
+        return new $className($auth, $ssl);
     }
 
     public static function myErrorHandler($errno, $errstr, $errfile, $errline) {
@@ -1489,28 +1486,6 @@ public function displayProfiling() {
        return $this->content_ajax;
 
     }
-
-    protected static function getErrorHandler(): ErrorHandler {
-
-        return ServiceLocator::getInstance()->getErrorHandler();
-    }
-
-    /**
-     * Returns error messages collected by ErrorHandler
-     * @return array
-     */
-    protected static function getErrorMessages() {
-
-        if (_EPH_MODE_DEV_) {
-            if (_EPH_DISPLAY_COMPATIBILITY_WARNING_) {
-                $mask = E_ALL;
-            } else {
-                $mask = E_ALL & ~(E_DEPRECATED | E_USER_DEPRECATED);
-            }
-            return static::getErrorHandler()->getErrorMessages(false, $mask);
-        }
-        return [];
-    }
 
 
 }

src/Adapter/Adapter_ServiceLocator.php

@@ -1,21 +1,25 @@
 <?php
 
-use Ephenyxdigital\Core\DependencyInjection\ServiceLocator;
-
 /**
  * Class Adapter_ServiceLocator
  */
 // @codingStandardsIgnoreStart
 class Adapter_ServiceLocator {
 
-
+    // @codingStandardsIgnoreEnd
+
+    /**
+     * Set a service container Instance
+     * @var Core_Foundation_IoC_Container
+     */
+    protected static $serviceContainer;
+
     /**
      * @param Core_Foundation_IoC_Container $container
      */
     public static function setServiceContainerInstance(Core_Foundation_IoC_Container $container) {
 
-        Tools::displayAsDeprecated();
-        ServiceLocator::initialize($container);
+        self::$serviceContainer = $container;
     }
 
     /**
@@ -31,7 +35,11 @@ public static function setServiceContainerInstance(Core_Foundation_IoC_Container
      */
     public static function get($serviceName) {
 
-        return ServiceLocator::getInstance()->getByServiceName($serviceName);
+        if (empty(self::$serviceContainer) || is_null(self::$serviceContainer)) {
+            throw new Adapter_Exception('Service container is not set.');
+        }
+
+        return self::$serviceContainer->make($serviceName);
     }
 
 }