Merge pull request #14407 from ruudboon/style-fixes

Style fixes (code quality)
phalcon · Sep 24, 2019 · 5de838f · 5de838f
2 parents d9c6b18 + ea8cdce
commit 5de838f
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 33 deletions.
diff --git a/CHANGELOG-4.0.md b/CHANGELOG-4.0.md
@@ -3,6 +3,9 @@
 - Fixed `Phalcon\Mvc\View\Engine\Volt\Compiler::parse()` Corrected syntax recognize for "set" keyword. [#14288](https://github.com/phalcon/cphalcon/issues/14288)
 - Fixed `Phalcon\Mvc\View\Engine\Volt\Compiler::parse()` Corrected syntax recognize for "is" keyword. [#11683](https://github.com/phalcon/cphalcon/issues/11683)
 
+## Removed
+- Removed `Phalcon\Application\AbstractApplication::handle()` as it does not serve any purpose and causing issues with type hinting. 
+
 # [4.0.0-rc.1](https://github.com/phalcon/cphalcon/releases/tag/v4.0.0-rc.1) (2019-09-23)
 
 ## Added

diff --git a/phalcon/Acl/Adapter/Memory.zep b/phalcon/Acl/Adapter/Memory.zep
@@ -19,7 +19,6 @@ use Phalcon\Acl\Exception;
 use Phalcon\Events\Manager as EventsManager;
 use Phalcon\Acl\RoleAware;
 use Phalcon\Acl\ComponentAware;
-use Phalcon\Acl\RoleInterface;
 use Phalcon\Acl\ComponentInterface;
 use ReflectionFunction;
 

diff --git a/phalcon/Annotations/Annotation.zep b/phalcon/Annotations/Annotation.zep
@@ -10,7 +10,6 @@
 
 namespace Phalcon\Annotations;
 
-use Phalcon\Annotations\Annotation;
 use Phalcon\Annotations\Exception;
 
 /**

diff --git a/phalcon/Application/AbstractApplication.zep b/phalcon/Application/AbstractApplication.zep
@@ -91,11 +91,6 @@ abstract class AbstractApplication extends Injectable implements EventsAwareInte
         return this->modules;
     }
 
-    /**
-     * Handles a request
-     */
-    abstract public function handle();
-
     /**
      * Register an array of modules present in the application
      *

diff --git a/phalcon/Factory/AbstractFactory.zep b/phalcon/Factory/AbstractFactory.zep
@@ -13,7 +13,7 @@ namespace Phalcon\Factory;
 use Phalcon\Config;
 use Phalcon\Factory\Exception;
 
-class AbstractFactory
+abstract class AbstractFactory
 {
     /**
      * @var array

diff --git a/phalcon/Forms/Element/Select.zep b/phalcon/Forms/Element/Select.zep
@@ -11,7 +11,7 @@
 namespace Phalcon\Forms\Element;
 
 use Phalcon\Forms\Element\AbstractElement;
-use Phalcon\Tag\Select;
+use Phalcon\Tag\Select as SelectTag;
 
 /**
  * Phalcon\Forms\Element\Select
@@ -73,7 +73,7 @@ class Select extends AbstractElement
         /**
          * Merged passed attributes with previously defined ones
          */
-        return Select::selectField(
+        return SelectTag::selectField(
             this->prepareAttributes(attributes),
             this->optionsValues
         );

diff --git a/phalcon/Forms/Form.zep b/phalcon/Forms/Form.zep
@@ -14,7 +14,6 @@ use Countable;
 use Iterator;
 use Phalcon\Di\Injectable;
 use Phalcon\Di\DiInterface;
-use Phalcon\FilterInterface;
 use Phalcon\Filter\FilterInterface;
 use Phalcon\Forms\Exception;
 use Phalcon\Forms\Element\ElementInterface;

diff --git a/phalcon/Helper/Fs.zep b/phalcon/Helper/Fs.zep
@@ -13,7 +13,8 @@ namespace Phalcon\Helper;
 /**
  * This class offers file operation helper
  */
-class Fs {
+class Fs
+{
 
     /**
      * Gets the filename from a given path, Same as PHP's basename() but has non-ASCII support.
@@ -30,8 +31,8 @@ class Fs {
     	var filename, matches;
         let uri = rtrim(uri, DIRECTORY_SEPARATOR);
         let filename = preg_match(
-        	"@[^" . preg_quote(DIRECTORY_SEPARATOR, "@") . "]+$@", 
-        	uri, 
+        	"@[^" . preg_quote(DIRECTORY_SEPARATOR, "@") . "]+$@",
+        	uri,
         	matches
         ) ? matches[0] : "";
         if suffix {

diff --git a/phalcon/Html/Attributes/RenderInterface.zep b/phalcon/Html/Attributes/RenderInterface.zep
@@ -14,7 +14,8 @@ namespace Phalcon\Html\Attributes;
 *
 * Interface Phalcon\Html\Attributes\RenderInterface
 */
-interface RenderInterface {
+interface RenderInterface
+{
     /**
      * Generate a string represetation
      */

diff --git a/phalcon/Http/RequestInterface.zep b/phalcon/Http/RequestInterface.zep
@@ -191,7 +191,7 @@ interface RequestInterface
      * @param bool onlyPath If true, query part will be omitted
      * @return string
      */
-    final public function getURI(bool onlyPath = false) -> string;
+    public function getURI(bool onlyPath = false) -> string;
 
     /**
      * Gets a variable from the $_POST superglobal applying filters if needed

diff --git a/phalcon/Image/Adapter/Imagick.zep b/phalcon/Image/Adapter/Imagick.zep
@@ -10,7 +10,7 @@
 
 namespace Phalcon\Image\Adapter;
 
-use Imagick;
+use Imagick as ImagicNative;
 use ImagickDraw;
 use ImagickPixel;
 use Phalcon\Image\Enum;
@@ -50,7 +50,7 @@ class Imagick extends AbstractAdapter
 
         let this->file = file;
 
-        let this->image = new Imagick();
+        let this->image = new ImagicNative();
 
         if file_exists(this->file) {
             let this->realpath = realpath(this->file);
@@ -105,7 +105,7 @@ class Imagick extends AbstractAdapter
      */
     public function __destruct()
     {
-        if this->image instanceof \Imagick {
+        if this->image instanceof ImagicNative {
             this->image->clear();
             this->image->destroy();
         }
@@ -138,7 +138,7 @@ class Imagick extends AbstractAdapter
     /**
      * Get instance
      */
-    public function getInternalImInstance() -> <\Imagick>
+    public function getInternalImInstance() -> <ImagicNative>
     {
         return this->image;
     }
@@ -166,7 +166,7 @@ class Imagick extends AbstractAdapter
 
         let pixel2 = new ImagickPixel("transparent");
 
-        let background = new Imagick();
+        let background = new ImagicNative();
 
         this->image->setIteratorIndex(0);
 
@@ -324,7 +324,7 @@ class Imagick extends AbstractAdapter
     {
         var mask, ret;
 
-        let mask = new Imagick();
+        let mask = new ImagicNative();
 
         mask->readImageBlob(
             image->render()
@@ -417,7 +417,7 @@ class Imagick extends AbstractAdapter
         }
 
         let pseudo = fadeIn ? "gradient:black-transparent" : "gradient:transparent-black",
-            fade = new Imagick();
+            fade = new ImagicNative();
 
         fade->newPseudoImage(
             reflection->getImageWidth(),
@@ -454,7 +454,7 @@ class Imagick extends AbstractAdapter
 
         fade->destroy();
 
-        let image = new Imagick(),
+        let image = new ImagicNative(),
             pixel = new ImagickPixel(),
             height = this->image->getImageHeight() + height;
 
@@ -808,7 +808,7 @@ class Imagick extends AbstractAdapter
         var watermark, ret;
 
         let opacity = opacity / 100,
-            watermark = new Imagick();
+            watermark = new ImagicNative();
 
         watermark->readImageBlob(
             image->render()

diff --git a/phalcon/Mvc/Model.zep b/phalcon/Mvc/Model.zep
@@ -41,7 +41,6 @@ use Phalcon\Mvc\Model\TransactionInterface;
 use Phalcon\Mvc\Model\ValidationFailed;
 use Phalcon\Mvc\ModelInterface;
 use Phalcon\Validation\ValidationInterface;
-use Phalcon\Events\ManagerInterface as EventsManagerInterface;
 use Serializable;
 
 /**

diff --git a/phalcon/Mvc/Model/ManagerInterface.zep b/phalcon/Mvc/Model/ManagerInterface.zep
@@ -262,7 +262,7 @@ interface ManagerInterface
      * );
      * ```
      */
-    final public function isVisibleModelProperty(<ModelInterface> model, string property) -> bool;
+    public function isVisibleModelProperty(<ModelInterface> model, string property) -> bool;
 
     /**
      * Sets if a model must keep snapshots

diff --git a/phalcon/Mvc/Model/Query.zep b/phalcon/Mvc/Model/Query.zep
@@ -30,7 +30,6 @@ use Phalcon\Di\InjectionAwareInterface;
 use Phalcon\Mvc\Model\RelationInterface;
 use Phalcon\Mvc\Model\TransactionInterface;
 use Phalcon\Db\DialectInterface;
-use Phalcon\Cache\Adapter\AdapterInterface;
 
 /**
  * Phalcon\Mvc\Model\Query

diff --git a/phalcon/Mvc/ModelInterface.zep b/phalcon/Mvc/ModelInterface.zep
@@ -13,11 +13,9 @@ use Phalcon\Db\Adapter\AdapterInterface;
 use Phalcon\Di\DiInterface;
 use Phalcon\Messages\MessageInterface;
 use Phalcon\Mvc\Model\CriteriaInterface;
-use Phalcon\Mvc\Model\ModelInterface;
 use Phalcon\Mvc\Model\MetaDataInterface;
 use Phalcon\Mvc\Model\ResultsetInterface;
 use Phalcon\Mvc\Model\TransactionInterface;
-use Phalcon\Mvc\ModelInterface;
 
 /**
  * Phalcon\Mvc\ModelInterface

diff --git a/phalcon/Validation/Validator/File/Size/Equal.zep b/phalcon/Validation/Validator/File/Size/Equal.zep
@@ -12,7 +12,6 @@ namespace Phalcon\Validation\Validator\File\Size;
 
 use Phalcon\Messages\Message;
 use Phalcon\Validation;
-use Phalcon\Validation\Validator\File\Size\Equal;
 use Phalcon\Validation\Validator\File\AbstractFile;
 
 /**

diff --git a/phalcon/Validation/Validator/File/Size/Max.zep b/phalcon/Validation/Validator/File/Size/Max.zep
@@ -12,7 +12,6 @@ namespace Phalcon\Validation\Validator\File\Size;
 
 use Phalcon\Messages\Message;
 use Phalcon\Validation;
-use Phalcon\Validation\Validator\File\Size\Max;
 use Phalcon\Validation\Validator\File\AbstractFile;
 
 /**

diff --git a/phalcon/Validation/Validator/File/Size/Min.zep b/phalcon/Validation/Validator/File/Size/Min.zep
@@ -12,7 +12,6 @@ namespace Phalcon\Validation\Validator\File\Size;
 
 use Phalcon\Messages\Message;
 use Phalcon\Validation;
-use Phalcon\Validation\Validator\File\Size\Min;
 use Phalcon\Validation\Validator\File\AbstractFile;
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ @@
     namespace Phalcon\Annotations;
-    use Phalcon\Annotations\Annotation;
     use Phalcon\Annotations\Exception;
     /**
@@ Expand Down @@