Merge pull request #12382 from SidRoberts/v4-parameter-return

[4.0.0] Strengthened parameter/return types

phalcon/annotations/adapter/apc.zep

@@ -45,10 +45,8 @@ class Apc extends Adapter
 
 	/**
 	 * Phalcon\Annotations\Adapter\Apc constructor
-	 *
-	 * @param array options
 	 */
-	public function __construct(options = null)
+	public function __construct(array options = [])
 	{
 		var prefix, ttl;
 

phalcon/annotations/adapter/files.zep

@@ -44,24 +44,18 @@ class Files extends Adapter
 
 	/**
 	 * Phalcon\Annotations\Adapter\Files constructor
-	 *
-	 * @param array options
 	 */
-	public function __construct(options = null)
+	public function __construct(array options = [])
 	{
 		var annotationsDir;
-		if typeof options == "array" {
-			if fetch annotationsDir, options["annotationsDir"] {
-				let this->_annotationsDir = annotationsDir;
-			}
+
+		if fetch annotationsDir, options["annotationsDir"] {
+			let this->_annotationsDir = annotationsDir;
 		}
 	}
 
 	/**
 	 * Reads parsed annotations from files
-	 *
-	 * @param string key
-	 * @return \Phalcon\Annotations\Reflection
 	 */
 	public function read(string key) -> <Reflection> | boolean | int
 	{

phalcon/annotations/adapter/xcache.zep

@@ -36,9 +36,6 @@ class Xcache extends Adapter
 {
 	/**
 	 * Reads parsed annotations from XCache
-	 *
-	 * @param string key
-	 * @return \Phalcon\Annotations\Reflection
 	 */
 	public function read(string! key) -> <Reflection> | boolean
 	{

phalcon/annotations/adapterinterface.zep

@@ -42,10 +42,8 @@ interface AdapterInterface
 
 	/**
 	 * Parses or retrieves all the annotations found in a class
-	 *
-	 * @param string|object className
-     */
-	public function get(className) -> <Reflection>;
+	 */
+	public function get(string className) -> <Reflection>;
 
 	/**
 	 * Returns the annotations found in all the class' methods

phalcon/annotations/annotation.zep

@@ -86,7 +86,6 @@ class Annotation
 	/**
 	 * Resolves an annotation expression
 	 *
-	 * @param array expr
 	 * @return mixed
 	 */
 	public function getExpression(array! expr)
@@ -183,7 +182,6 @@ class Annotation
 	 * Returns an argument in a specific position
 	 *
 	 * @param int|string position
-	 * @return boolean
 	 */
 	public function hasArgument(var position) -> boolean
 	{

phalcon/annotations/collection.zep

@@ -52,20 +52,16 @@ class Collection implements \Iterator, \Countable
 	 *
 	 * @param array reflectionData
 	 */
-	public function __construct(var reflectionData = null)
+	public function __construct(array reflectionData = [])
 	{
 		var annotations, annotationData;
 
-		if typeof reflectionData != "null" && typeof reflectionData != "array" {
-			throw new Exception("Reflection data must be an array");
-		}
-
 		let annotations = [];
-		if typeof reflectionData == "array" {
-			for annotationData in reflectionData {
-				let annotations[] = new Annotation(annotationData);
-			}
+
+		for annotationData in reflectionData {
+			let annotations[] = new Annotation(annotationData);
 		}
+
 		let this->_annotations = annotations;
 	}
 
@@ -87,8 +83,6 @@ class Collection implements \Iterator, \Countable
 
 	/**
 	 * Returns the current annotation in the iterator
-	 *
-	 * @return \Phalcon\Annotations\Annotation
 	 */
 	public function current() -> <Annotation> | boolean
 	{

phalcon/annotations/reflection.zep

@@ -54,14 +54,10 @@ class Reflection
 
 	/**
 	 * Phalcon\Annotations\Reflection constructor
-	 *
-	 * @param array reflectionData
 	 */
-	public function __construct(reflectionData = null)
+	public function __construct(array reflectionData = [])
 	{
-		if typeof reflectionData == "array" {
-			let this->_reflectionData = reflectionData;
-		}
+		let this->_reflectionData = reflectionData;
 	}
 
 	/**
@@ -141,30 +137,24 @@ class Reflection
 
 	/**
 	 * Returns the raw parsing intermediate definitions used to construct the reflection
-	 *
-	 * @return array
 	 */
-	public function getReflectionData()
+	public function getReflectionData() -> array
 	{
 		return this->_reflectionData;
 	}
 
 	/**
 	 * Restores the state of a Phalcon\Annotations\Reflection variable export
-	 *
-	 * @return array data
 	 */
-	public static function __set_state(data) -> <Reflection>
+	public static function __set_state(array! data) -> <Reflection>
 	{
 		var reflectionData;
 
-		if typeof data == "array" {
-			/**
-			 * Check for a '_reflectionData' in the array to build the Reflection
-			 */
-			if fetch reflectionData, data["_reflectionData"] {
-				return new self(reflectionData);
-			}
+		/**
+		 * Check for a '_reflectionData' in the array to build the Reflection
+		 */
+		if fetch reflectionData, data["_reflectionData"] {
+			return new self(reflectionData);
 		}
 
 		return new self();

phalcon/assets/collection.zep

@@ -156,13 +156,9 @@ class Collection implements \Countable, \Iterator
 	/**
 	 * Adds a javascript resource to the collection
 	 *
-	 * @param string path
-	 * @param boolean local
-	 * @param boolean filter
 	 * @param array attributes
-	 * @return \Phalcon\Assets\Collection
 	 */
-	public function addJs(string! path, var local = null, boolean filter = true, attributes = null) -> <Collection>
+	public function addJs(string! path, boolean local = null, boolean filter = true, attributes = null) -> <Collection>
 	{
 		var collectionLocal, collectionAttributes;
 
@@ -227,10 +223,8 @@ class Collection implements \Countable, \Iterator
 
 	/**
 	 * Returns the current position/key in the iterator
-	 *
-	 * @return int
 	 */
-	public function key()
+	public function key() -> int
 	{
 		return this->_position;
 	}

phalcon/assets/inline.zep

@@ -41,20 +41,13 @@ class $Inline implements ResourceInterface
 
 	/**
 	 * Phalcon\Assets\Inline constructor
-	 *
-	 * @param string type
-	 * @param string content
-	 * @param boolean filter
-	 * @param array attributes
 	 */
-	public function __construct(string type, string content, boolean filter = true, attributes = null)
+	public function __construct(string type, string content, boolean filter = true, array attributes = [])
 	{
 		let this->_type = type,
 			this->_content = content,
-			this->_filter = filter;
-		if typeof attributes == "array" {
-			let this->_attributes = attributes;
-		}
+			this->_filter = filter,
+			this->_attributes = attributes;
 	}
 
 	/**

phalcon/assets/inline/css.zep

@@ -32,8 +32,6 @@ class Css extends InlineBase
 	/**
 	 * Phalcon\Assets\Inline\Css
 	 *
-	 * @param string content
-	 * @param boolean filter
 	 * @param array attributes
 	 */
 	public function __construct(string content, boolean filter = true, attributes = null)

phalcon/assets/inline/js.zep

@@ -32,8 +32,6 @@ class Js extends InlineBase
 	/**
 	 * Phalcon\Assets\Inline\Js
 	 *
-	 * @param string content
-	 * @param boolean filter
 	 * @param array attributes
 	 */
 	public function __construct(string content, boolean filter = true, var attributes = null)

phalcon/assets/manager.zep

@@ -48,14 +48,10 @@ class Manager
 
 	/**
 	 * Phalcon\Assets\Manager
-	 *
-	 * @param array options
 	 */
-	public function __construct(options = null)
+	public function __construct(array options = [])
 	{
-		if typeof options == "array" {
-			let this->_options = options;
-		}
+		let this->_options = options;
 	}
 
 	/**
@@ -302,7 +298,6 @@ class Manager
 	/**
 	 * Traverses a collection calling the callback to generate its HTML
 	 *
-	 * @param \Phalcon\Assets\Collection collection
 	 * @param callback callback
 	 * @param string type
 	 */
@@ -712,7 +707,6 @@ class Manager
 	/**
 	 * Traverses a collection and generate its HTML
 	 *
-	 * @param \Phalcon\Assets\Collection collection
 	 * @param string type
 	 */
 	public function outputInline(<Collection> collection, type) -> string
@@ -772,10 +766,8 @@ class Manager
 
 	/**
 	 * Prints the HTML for CSS resources
-	 *
-	 * @param string collectionName
 	 */
-	public function outputCss(collectionName = null) -> string
+	public function outputCss(string collectionName = null) -> string
 	{
 		var collection;
 
@@ -790,10 +782,8 @@ class Manager
 
 	/**
 	 * Prints the HTML for inline CSS
-	 *
-	 * @param string collectionName
 	 */
-	public function outputInlineCss(collectionName = null) -> string
+	public function outputInlineCss(string collectionName = null) -> string
 	{
 		var collection;
 
@@ -808,10 +798,8 @@ class Manager
 
 	/**
 	 * Prints the HTML for JS resources
-	 *
-	 * @param string collectionName
 	 */
-	public function outputJs(collectionName = null) -> string
+	public function outputJs(string collectionName = null) -> string
 	{
 		var collection;
 
@@ -826,10 +814,8 @@ class Manager
 
 	/**
 	 * Prints the HTML for inline JS
-	 *
-	 * @param string collectionName
 	 */
-	public function outputInlineJs(collectionName = null) -> string
+	public function outputInlineJs(string collectionName = null) -> string
 	{
 		var collection;
 

phalcon/assets/resource.zep

@@ -63,22 +63,14 @@ class $Resource implements ResourceInterface
 
 	/**
 	 * Phalcon\Assets\Resource constructor
-	 *
-	 * @param string type
-	 * @param string path
-	 * @param boolean local
-	 * @param boolean filter
-	 * @param array attributes
 	 */
-	public function __construct(string type, string path, boolean local = true, boolean filter = true, attributes = null)
+	public function __construct(string type, string path, boolean local = true, boolean filter = true, array attributes = [])
 	{
 		let this->_type = type,
 			this->_path = path,
 			this->_local = local,
-			this->_filter = filter;
-		if typeof attributes == "array" {
-			let this->_attributes = attributes;
-		}
+			this->_filter = filter,
+			this->_attributes = attributes;
 	}
 
 	/**

phalcon/assets/resource/css.zep

@@ -31,13 +31,8 @@ class Css extends ResourceBase
 
 	/**
 	 * Phalcon\Assets\Resource\Css
-	 *
-	 * @param string path
-	 * @param boolean local
-	 * @param boolean filter
-	 * @param array attributes
 	 */
-	public function __construct(string! path, boolean local = true, boolean filter = true, attributes = null)
+	public function __construct(string! path, boolean local = true, boolean filter = true, array attributes = [])
 	{
 		parent::__construct("css", path, local, filter, attributes);
 	}

phalcon/assets/resource/js.zep

@@ -31,13 +31,8 @@ class Js extends ResourceBase
 
 	/**
 	 * Phalcon\Assets\Resource\Js
-	 *
-	 * @param string path
-	 * @param boolean local
-	 * @param boolean filter
-	 * @param array attributes
 	 */
-	public function __construct(path, local = true, filter = true, attributes = null)
+	public function __construct(string! path, boolean local = true, boolean filter = true, array attributes = [])
 	{
 		parent::__construct("js", path, local, filter, attributes);
 	}

phalcon/cache/backend.zep

@@ -45,11 +45,8 @@ abstract class Backend implements BackendInterface
 
 	/**
 	 * Phalcon\Cache\Backend constructor
-	 *
-	 * @param \Phalcon\Cache\FrontendInterface frontend
-	 * @param array options
 	 */
-	public function __construct(<FrontendInterface> frontend, options = null)
+	public function __construct(<FrontendInterface> frontend, array options = [])
 	{
 		var prefix;
 
@@ -129,8 +126,6 @@ abstract class Backend implements BackendInterface
 
 	/**
 	 * Gets the last lifetime set
-	 *
-	 * @return int
 	 */
 	public function getLifetime() -> int
 	{