[#15038] - Refactor on the factory service discovery

niden · niden · commit 5f4dfcf4642c · 2020-05-13T16:32:41.000-04:00
diff --git a/phalcon/Annotations/AnnotationsFactory.zep b/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,
diff --git a/phalcon/Cache/AdapterFactory.zep b/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,
diff --git a/phalcon/Config/ConfigFactory.zep b/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;
 
diff --git a/phalcon/Db/Adapter/PdoFactory.zep b/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,
diff --git a/phalcon/Factory/AbstractFactory.zep b/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.
      */
diff --git a/phalcon/Html/TagFactory.zep b/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,
                     [
diff --git a/phalcon/Image/ImageFactory.zep b/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,
diff --git a/phalcon/Logger/AdapterFactory.zep b/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,
diff --git a/phalcon/Paginator/PaginatorFactory.zep b/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,
diff --git a/phalcon/Storage/AdapterFactory.zep b/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,
diff --git a/phalcon/Storage/SerializerFactory.zep b/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);
     }
diff --git a/phalcon/Translate/InterpolatorFactory.zep b/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);
     }
diff --git a/phalcon/Translate/TranslateFactory.zep b/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,
diff --git a/phalcon/Validation/ValidatorFactory.zep b/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);
     }

Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,7 @@ class AnnotationsFactory extends AbstractFactory`
`66`	`66`	`{`
`67`	`67`	`var definition;`
`68`	`68`
`69`		`- this->checkService(name);`
`70`		`-`
`71`		`- let definition = this->mapper[name];`
	`69`	`+ let definition = this->getService(name);`
`72`	`70`
`73`	`71`	`return create_instance_params(`
`74`	`72`	`definition,`
Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,7 @@ class AdapterFactory extends AbstractFactory`
`63`	`63`	`{`
`64`	`64`	`var definition;`
`65`	`65`
`66`		`- this->checkService(name);`
`67`		`-`
`68`		`- let definition = this->mapper[name];`
	`66`	`+ let definition = this->getService(name);`
`69`	`67`
`70`	`68`	`return create_instance_params(`
`71`	`69`	`definition,`
Original file line number	Diff line number	Diff line change
`@@ -115,9 +115,7 @@ class ConfigFactory extends AbstractFactory`
`115`	`115`	`{`
`116`	`116`	`var definition, options;`
`117`	`117`
`118`		`- this->checkService(name);`
`119`		`-`
`120`		`- let definition = this->mapper[name],`
	`118`	`+ let definition = this->getService(name),`
`121`	`119`	`options = [],`
`122`	`120`	`options[] = fileName;`
`123`	`121`
Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,7 @@ class PdoFactory extends AbstractFactory`
`62`	`62`	`{`
`63`	`63`	`var definition;`
`64`	`64`
`65`		`- this->checkService(name);`
`66`		`-`
`67`		`- let definition = this->mapper[name];`
	`65`	`+ let definition = this->getService(name);`
`68`	`66`
`69`	`67`	`return create_instance_params(`
`70`	`68`	`definition,`
Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,8 @@ class TagFactory extends AbstractFactory`
`44`	`44`	`{`
`45`	`45`	`var definition;`
`46`	`46`
`47`		`- this->checkService(name);`
`48`		`-`
`49`	`47`	`if !isset this->services[name] {`
`50`		`- let definition = this->mapper[name],`
	`48`	`+ let definition = this->getService(name),`
`51`	`49`	`this->services[name] = create_instance_params(`
`52`	`50`	`definition,`
`53`	`51`	`[`
Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,7 @@ class ImageFactory extends AbstractFactory`
`73`	`73`	`{`
`74`	`74`	`var definition;`
`75`	`75`
`76`		`- this->checkService(name);`
`77`		`-`
`78`		`- let definition = this->mapper[name];`
	`76`	`+ let definition = this->getService(name);`
`79`	`77`
`80`	`78`	`return create_instance_params(`
`81`	`79`	`definition,`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,7 @@ class AdapterFactory extends AbstractFactory`
`34`	`34`	`{`
`35`	`35`	`var definition;`
`36`	`36`
`37`		`- this->checkService(name);`
`38`		`-`
`39`		`- let definition = this->mapper[name];`
	`37`	`+ let definition = this->getService(name);`
`40`	`38`
`41`	`39`	`return create_instance_params(`
`42`	`40`	`definition,`
Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,7 @@ class PaginatorFactory extends AbstractFactory`
`72`	`72`	`{`
`73`	`73`	`var definition;`
`74`	`74`
`75`		`- this->checkService(name);`
`76`		`-`
`77`		`- let definition = this->mapper[name];`
	`75`	`+ let definition = this->getService(name);`
`78`	`76`
`79`	`77`	`return create_instance_params(`
`80`	`78`	`definition,`
Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,7 @@ class AdapterFactory extends AbstractFactory`
`58`	`58`	`{`
`59`	`59`	`var definition;`
`60`	`60`
`61`		`- this->checkService(name);`
`62`		`-`
`63`		`- let definition = this->mapper[name];`
	`61`	`+ let definition = this->getService(name);`
`64`	`62`
`65`	`63`	`return create_instance_params(`
`66`	`64`	`definition,`