T15038 factory newinstance

CHANGELOG-4.0.md

@@ -12,6 +12,7 @@
 - Changed return type hint for `Phalcon\Mvc\Model\Manager::getCustomEventsManager` to return NULL instead of boolean FALSE if there is no special events manager [#15008](https://github.com/phalcon/cphalcon/issues/15008)
 - Changed `Phalcon\Mvc\Model\MetaData::getDI` so that now it will throw a `Phalcon\Mvc\Model\Exception` if there is no `DiInterface` instance  [#15011](https://github.com/phalcon/cphalcon/issues/15011)
 - Changed `Phalcon\Http\Request::getJsonRawBody` to use `json_decode` instead of `Phalcon\Json::decode` [#14936](https://github.com/phalcon/cphalcon/issues/14936)
+- Changed `Phalcon\Factory\AbstractFactory` to expose `getService` which will throw an exception if it does not exist. Removed `checkService` and adjusted all references in `newInstance()` calls. [#15038](https://github.com/phalcon/cphalcon/issues/15038)
 
 ## Fixed
 - Fixed `Phalcon\Mvc\Model\Query\Builder::getPhql` to add single quote between string value on a simple condition [#14874](https://github.com/phalcon/cphalcon/issues/14874)

phalcon/Annotations/AnnotationsFactory.zep

@@ -66,9 +66,7 @@ class AnnotationsFactory extends AbstractFactory
     {
         var definition;
 
-        this->checkService(name);
-
-        let definition = this->mapper[name];
+        let definition = this->getService(name);
 
         return create_instance_params(
             definition,

phalcon/Cache/AdapterFactory.zep

@@ -63,9 +63,7 @@ class AdapterFactory extends AbstractFactory
     {
         var definition;
 
-        this->checkService(name);
-
-        let definition = this->mapper[name];
+        let definition = this->getService(name);
 
         return create_instance_params(
             definition,

phalcon/Config/ConfigFactory.zep

@@ -115,9 +115,7 @@ class ConfigFactory extends AbstractFactory
     {
         var definition, options;
 
-        this->checkService(name);
-
-        let definition = this->mapper[name],
+        let definition = this->getService(name),
             options    = [],
             options[]  = fileName;
 

phalcon/Db/Adapter/PdoFactory.zep

@@ -62,9 +62,7 @@ class PdoFactory extends AbstractFactory
     {
         var definition;
 
-        this->checkService(name);
-
-        let definition = this->mapper[name];
+        let definition = this->getService(name);
 
         return create_instance_params(
             definition,

phalcon/Factory/AbstractFactory.zep

@@ -24,16 +24,6 @@ abstract class AbstractFactory
      */
     protected services = [];
 
-    /**
-     * Checks if a service exists and throws an exception
-     */
-    protected function checkService(string! name) -> void
-    {
-        if unlikely !isset this->mapper[name] {
-            throw new Exception("Service " . name . " is not registered");
-        }
-    }
-
     /**
      * Checks the config if it is a valid object
      */
@@ -63,6 +53,18 @@ abstract class AbstractFactory
      */
     abstract protected function getAdapters() -> array;
 
+    /**
+     * Checks if a service exists and throws an exception
+     */
+    protected function getService(string! name) -> var
+    {
+        if unlikely !isset this->mapper[name] {
+            throw new Exception("Service " . name . " is not registered");
+        }
+
+        return this->mapper[name];
+    }
+
     /**
      * AdapterFactory constructor.
      */

phalcon/Html/TagFactory.zep

@@ -44,10 +44,8 @@ class TagFactory extends AbstractFactory
     {
         var definition;
 
-        this->checkService(name);
-
         if !isset this->services[name] {
-            let definition           = this->mapper[name],
+            let definition           = this->getService(name),
                 this->services[name] = create_instance_params(
                     definition,
                     [

phalcon/Image/ImageFactory.zep

@@ -73,9 +73,7 @@ class ImageFactory extends AbstractFactory
     {
         var definition;
 
-        this->checkService(name);
-
-        let definition = this->mapper[name];
+        let definition = this->getService(name);
 
         return create_instance_params(
             definition,

phalcon/Logger/AdapterFactory.zep

@@ -34,9 +34,7 @@ class AdapterFactory extends AbstractFactory
     {
         var definition;
 
-        this->checkService(name);
-
-        let definition = this->mapper[name];
+        let definition = this->getService(name);
 
         return create_instance_params(
             definition,

phalcon/Paginator/PaginatorFactory.zep

@@ -72,9 +72,7 @@ class PaginatorFactory extends AbstractFactory
     {
         var definition;
 
-        this->checkService(name);
-
-        let definition = this->mapper[name];
+        let definition = this->getService(name);
 
         return create_instance_params(
             definition,

phalcon/Storage/AdapterFactory.zep

@@ -58,9 +58,7 @@ class AdapterFactory extends AbstractFactory
     {
         var definition;
 
-        this->checkService(name);
-
-        let definition = this->mapper[name];
+        let definition = this->getService(name);
 
         return create_instance_params(
             definition,

phalcon/Storage/SerializerFactory.zep

@@ -35,9 +35,7 @@ class SerializerFactory extends AbstractFactory
     {
         var definition;
 
-        this->checkService(name);
-
-        let definition = this->mapper[name];
+        let definition = this->getService(name);
 
         return create_instance(definition);
     }

phalcon/Translate/InterpolatorFactory.zep

@@ -30,9 +30,7 @@ class InterpolatorFactory extends AbstractFactory
     {
         var definition;
 
-        this->checkService(name);
-
-        let definition = this->mapper[name];
+        let definition = this->getService(name);
 
         return create_instance(definition);
     }

phalcon/Translate/TranslateFactory.zep

@@ -67,9 +67,7 @@ class TranslateFactory extends AbstractFactory
     {
         var definition;
 
-        this->checkService(name);
-
-        let definition = this->mapper[name];
+        let definition = this->getService(name);
 
         return create_instance_params(
             definition,

phalcon/Validation/ValidatorFactory.zep

@@ -30,9 +30,7 @@ class ValidatorFactory extends AbstractFactory
     {
         var definition;
 
-        this->checkService(name);
-
-        let definition = this->mapper[name];
+        let definition = this->getService(name);
 
         return create_instance(definition);
     }