Merge pull request #11441 from sergeyklay/interface_construct

Removed __construct from all interfaces
phalcon · Feb 25, 2016 · e552f86 · e552f86
2 parents 16753bd + 9d6c652
commit e552f86
Show file tree

Hide file tree

Showing 24 changed files with 36 additions and 189 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -46,6 +46,7 @@
 - Fixed issue with `Model::__set` that was setting hidden attributes directly when setters are not declared [#11286](https://github.com/phalcon/cphalcon/issues/11286)
 - Added `Phalcon\Cli\DispatcherInterface`, `Phalcon\Cli\TaskInterface`, `Phalcon\Cli\RouterInterface` and `Phalcon\Cli\Router\RouteInterface`.
 - Added methods update(), create() and createIfNotExist(array criteria) to `Phalcon\Mvc\Collection`
+- Removed `__construct` from all interfaces [#11410](https://github.com/phalcon/cphalcon/issues/11410)
 
 # [2.0.11](https://github.com/phalcon/cphalcon/releases/tag/phalcon-v2.0.11) (????-??-??)
 - Fix Model magic set functionality to maintain variable visibility and utilize setter methods.[#11286](https://github.com/phalcon/cphalcon/issues/11286)

diff --git a/phalcon/acl/resourceaware.zep b/phalcon/acl/resourceaware.zep
@@ -3,7 +3,7 @@
  +------------------------------------------------------------------------+
  | Phalcon Framework                                                      |
  +------------------------------------------------------------------------+
- | Copyright (c) 2011-2015 Phalcon Team (http://www.phalconphp.com)       |
+ | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
  +------------------------------------------------------------------------+
  | This source file is subject to the New BSD License that is bundled     |
  | with this package in the file docs/LICENSE.txt.                        |
@@ -22,7 +22,7 @@ namespace Phalcon\Acl;
 /**
  * Phalcon\Acl\ResourceAware
  *
- * Interface for classes which could be used in allow method as RESOURCE, ResourceInterface need __construct method so i decided to do this simple interface
+ * Interface for classes which could be used in allow method as RESOURCE
  */
 interface ResourceAware
 {

diff --git a/phalcon/acl/resourceinterface.zep b/phalcon/acl/resourceinterface.zep
@@ -3,7 +3,7 @@
  +------------------------------------------------------------------------+
  | Phalcon Framework                                                      |
  +------------------------------------------------------------------------+
- | Copyright (c) 2011-2015 Phalcon Team (http://www.phalconphp.com)       |
+ | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
  +------------------------------------------------------------------------+
  | This source file is subject to the New BSD License that is bundled     |
  | with this package in the file docs/LICENSE.txt.                        |
@@ -27,12 +27,6 @@ namespace Phalcon\Acl;
  */
 interface ResourceInterface
 {
-
-	/**
-	 * Phalcon\Acl\ResourceInterface constructor
-	 */
-	public function __construct(string! name, description = null);
-
 	/**
 	 * Returns the resource name
 	 */

diff --git a/phalcon/acl/roleaware.zep b/phalcon/acl/roleaware.zep
@@ -3,7 +3,7 @@
  +------------------------------------------------------------------------+
  | Phalcon Framework                                                      |
  +------------------------------------------------------------------------+
- | Copyright (c) 2011-2015 Phalcon Team (http://www.phalconphp.com)       |
+ | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
  +------------------------------------------------------------------------+
  | This source file is subject to the New BSD License that is bundled     |
  | with this package in the file docs/LICENSE.txt.                        |
@@ -22,7 +22,7 @@ namespace Phalcon\Acl;
 /**
  * Phalcon\Acl\RoleAware
  *
- * Interface for classes which could be used in allow method as ROLE, RoleInterace need __construct method so i decided to do this simple interface
+ * Interface for classes which could be used in allow method as ROLE
  */
 interface RoleAware
 {

diff --git a/phalcon/acl/roleinterface.zep b/phalcon/acl/roleinterface.zep
@@ -3,7 +3,7 @@
  +------------------------------------------------------------------------+
  | Phalcon Framework                                                      |
  +------------------------------------------------------------------------+
- | Copyright (c) 2011-2015 Phalcon Team (http://www.phalconphp.com)       |
+ | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
  +------------------------------------------------------------------------+
  | This source file is subject to the New BSD License that is bundled     |
  | with this package in the file docs/LICENSE.txt.                        |
@@ -26,12 +26,6 @@ namespace Phalcon\Acl;
  */
 interface RoleInterface
 {
-
-	/**
-	 * Phalcon\Acl\Role constructor
-	 */
-	public function __construct(string! name, string description = null);
-
 	/**
 	 * Returns the role name
 	 */

diff --git a/phalcon/cli/router/routeinterface.zep b/phalcon/cli/router/routeinterface.zep
@@ -3,7 +3,7 @@
  +------------------------------------------------------------------------+
  | Phalcon Framework                                                      |
  +------------------------------------------------------------------------+
- | Copyright (c) 2011-2015 Phalcon Team (http://www.phalconphp.com)       |
+ | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
  +------------------------------------------------------------------------+
  | This source file is subject to the New BSD License that is bundled     |
  | with this package in the file docs/LICENSE.txt.                        |
@@ -26,12 +26,6 @@ namespace Phalcon\Cli\Router;
  */
 interface RouteInterface
 {
-
-	/**
-	 * Phalcon\Cli\Router\Route constructor
-	 */
-	public function __construct(string! pattern, var paths = null);
-
 	/**
 	 * Replaces placeholders from pattern returning a valid PCRE regular expression
 	 */

diff --git a/phalcon/db/adapterinterface.zep b/phalcon/db/adapterinterface.zep
@@ -3,7 +3,7 @@
  +------------------------------------------------------------------------+
  | Phalcon Framework                                                      |
  +------------------------------------------------------------------------+
- | Copyright (c) 2011-2015 Phalcon Team (http://www.phalconphp.com)       |
+ | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
  +------------------------------------------------------------------------+
  | This source file is subject to the New BSD License that is bundled     |
  | with this package in the file docs/LICENSE.txt.                        |
@@ -26,12 +26,6 @@ namespace Phalcon\Db;
  */
 interface AdapterInterface
 {
-
-	/**
-	 * Constructor for Phalcon\Db\Adapter
-	 */
-	public function __construct(array! descriptor);
-
 	/**
 	 * Returns the first row in a SQL query result
 	 *

diff --git a/phalcon/db/columninterface.zep b/phalcon/db/columninterface.zep
@@ -3,7 +3,7 @@
  +------------------------------------------------------------------------+
  | Phalcon Framework                                                      |
  +------------------------------------------------------------------------+
- | Copyright (c) 2011-2015 Phalcon Team (http://www.phalconphp.com)       |
+ | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
  +------------------------------------------------------------------------+
  | This source file is subject to the New BSD License that is bundled     |
  | with this package in the file docs/LICENSE.txt.                        |
@@ -26,12 +26,6 @@ namespace Phalcon\Db;
  */
 interface ColumnInterface
 {
-
-	/**
-	 * Phalcon\Db\ColumnInterface constructor
-	 */
-	public function __construct(string! columnName, array! definition);
-
 	/**
 	 * Returns schema's table related to column
 	 *

diff --git a/phalcon/db/indexinterface.zep b/phalcon/db/indexinterface.zep
@@ -3,7 +3,7 @@
  +------------------------------------------------------------------------+
  | Phalcon Framework                                                      |
  +------------------------------------------------------------------------+
- | Copyright (c) 2011-2015 Phalcon Team (http://www.phalconphp.com)       |
+ | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
  +------------------------------------------------------------------------+
  | This source file is subject to the New BSD License that is bundled     |
  | with this package in the file docs/LICENSE.txt.                        |
@@ -26,16 +26,6 @@ namespace Phalcon\Db;
  */
 interface IndexInterface
 {
-
-	/**
-	 * Phalcon\Db\Index constructor
-	 *
-	 * @param string indexName
-	 * @param array columns
-	 * @param string type
-	 */
-	public function __construct(string! indexName, array! columns, type = null);
-
 	/**
 	 * Gets the index name
 	 *
@@ -62,4 +52,4 @@ interface IndexInterface
 	 */
 	public static function __set_state(array! data) -> <IndexInterface>;
 
-}
+}
diff --git a/phalcon/db/referenceinterface.zep b/phalcon/db/referenceinterface.zep
@@ -3,7 +3,7 @@
  +------------------------------------------------------------------------+
  | Phalcon Framework                                                      |
  +------------------------------------------------------------------------+
- | Copyright (c) 2011-2015 Phalcon Team (http://www.phalconphp.com)       |
+ | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
  +------------------------------------------------------------------------+
  | This source file is subject to the New BSD License that is bundled     |
  | with this package in the file docs/LICENSE.txt.                        |
@@ -26,12 +26,6 @@ namespace Phalcon\Db;
  */
 interface ReferenceInterface
 {
-
-	/**
-	 * Phalcon\Db\ReferenceInterface constructor
-	 */
-	public function __construct(string! referenceName, array! definition);
-
 	/**
 	 * Gets the index name
 	 *
@@ -93,4 +87,4 @@ interface ReferenceInterface
 	 */
 	public static function __set_state(array! data) -> <ReferenceInterface>;
 
-}
+}
diff --git a/phalcon/db/resultinterface.zep b/phalcon/db/resultinterface.zep
@@ -3,7 +3,7 @@
  +------------------------------------------------------------------------+
  | Phalcon Framework                                                      |
  +------------------------------------------------------------------------+
- | Copyright (c) 2011-2015 Phalcon Team (http://www.phalconphp.com)       |
+ | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
  +------------------------------------------------------------------------+
  | This source file is subject to the New BSD License that is bundled     |
  | with this package in the file docs/LICENSE.txt.                        |
@@ -26,18 +26,6 @@ namespace Phalcon\Db;
  */
 interface ResultInterface
 {
-
-	/**
-	 * Phalcon\Db\Result\Pdo constructor
-	 *
-	 * @param \Phalcon\Db\AdapterInterface connection
-	 * @param \PDOStatement result
-	 * @param string sqlStatement
-	 * @param array bindParams
-	 * @param array bindTypes
-	 */
-	public function __construct(<\Phalcon\Db\AdapterInterface> connection, <\PDOStatement> result, sqlStatement = null, bindParams = null, bindTypes = null);
-
 	/**
 	 * Allows to executes the statement again. Some database systems don't support scrollable cursors,
 	 * So, as cursors are forward only, we need to execute the cursor again to fetch rows from the begining

diff --git a/phalcon/di/serviceinterface.zep b/phalcon/di/serviceinterface.zep
@@ -3,7 +3,7 @@
  +------------------------------------------------------------------------+
  | Phalcon Framework                                                      |
  +------------------------------------------------------------------------+
- | Copyright (c) 2011-2015 Phalcon Team (http://www.phalconphp.com)       |
+ | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
  +------------------------------------------------------------------------+
  | This source file is subject to the New BSD License that is bundled     |
  | with this package in the file docs/LICENSE.txt.                        |
@@ -26,16 +26,6 @@ namespace Phalcon\Di;
  */
 interface ServiceInterface
 {
-
-	/**
-	 * Phalcon\Di\ServiceInterface
-	 *
-	 * @param string name
-	 * @param mixed definition
-	 * @param boolean shared
-	 */
-	public function __construct(string name, definition, boolean shared = false);
-
 	/**
 	 * Returns the service's name
 	 *

diff --git a/phalcon/http/request/fileinterface.zep b/phalcon/http/request/fileinterface.zep
@@ -3,7 +3,7 @@
  +------------------------------------------------------------------------+
  | Phalcon Framework                                                      |
  +------------------------------------------------------------------------+
- | Copyright (c) 2011-2015 Phalcon Team (http://www.phalconphp.com)       |
+ | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
  +------------------------------------------------------------------------+
  | This source file is subject to the New BSD License that is bundled     |
  | with this package in the file docs/LICENSE.txt.                        |
@@ -27,12 +27,6 @@ namespace Phalcon\Http\Request;
  */
 interface FileInterface
 {
-
-	/**
-	 * Phalcon\Http\Request\FileInterface constructor
-	 */
-	public function __construct(array! file, key = null);
-
 	/**
 	 * Returns the file size of the uploaded file
 	 */
@@ -64,4 +58,4 @@ interface FileInterface
 	 */
 	public function moveTo(string! destination) -> boolean;
 
-}
+}
diff --git a/phalcon/mvc/collection/behaviorinterface.zep b/phalcon/mvc/collection/behaviorinterface.zep
@@ -3,7 +3,7 @@
  +------------------------------------------------------------------------+
  | Phalcon Framework                                                      |
  +------------------------------------------------------------------------+
- | Copyright (c) 2011-2015 Phalcon Team (http://www.phalconphp.com)       |
+ | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
  +------------------------------------------------------------------------+
  | This source file is subject to the New BSD License that is bundled     |
  | with this package in the file docs/LICENSE.txt.                        |
@@ -28,14 +28,6 @@ use Phalcon\Mvc\CollectionInterface;
  */
 interface BehaviorInterface
 {
-
-	/**
-	 * Phalcon\Mvc\Collection\Behavior
-	 *
-	 * @param array options
-	 */
-	public function __construct(options = null);
-
 	/**
 	 * This method receives the notifications from the EventsManager
 	 */
@@ -46,4 +38,4 @@ interface BehaviorInterface
 	 */
 	public function missingMethod(<CollectionInterface> collection, string !method, arguments = null);
 
-}
+}
diff --git a/phalcon/mvc/model/behaviorinterface.zep b/phalcon/mvc/model/behaviorinterface.zep
@@ -3,7 +3,7 @@
  +------------------------------------------------------------------------+
  | Phalcon Framework                                                      |
  +------------------------------------------------------------------------+
- | Copyright (c) 2011-2015 Phalcon Team (http://www.phalconphp.com)       |
+ | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
  +------------------------------------------------------------------------+
  | This source file is subject to the New BSD License that is bundled     |
  | with this package in the file docs/LICENSE.txt.                        |
@@ -28,14 +28,6 @@ use Phalcon\Mvc\ModelInterface;
  */
 interface BehaviorInterface
 {
-
-	/**
-	 * Phalcon\Mvc\Model\Behavior
-	 *
-	 * @param array options
-	 */
-	public function __construct(options = null);
-
 	/**
 	 * This method receives the notifications from the EventsManager
 	 */

diff --git a/phalcon/mvc/model/messageinterface.zep b/phalcon/mvc/model/messageinterface.zep
@@ -3,7 +3,7 @@
  +------------------------------------------------------------------------+
  | Phalcon Framework                                                      |
  +------------------------------------------------------------------------+
- | Copyright (c) 2011-2015 Phalcon Team (http://www.phalconphp.com)       |
+ | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
  +------------------------------------------------------------------------+
  | This source file is subject to the New BSD License that is bundled     |
  | with this package in the file docs/LICENSE.txt.                        |
@@ -26,16 +26,6 @@ namespace Phalcon\Mvc\Model;
  */
 interface MessageInterface
 {
-
-	/**
-	 * Phalcon\Mvc\Model\Message constructor
-	 *
-	 * @param string message
-	 * @param string field
-	 * @param string type
-	 */
-	public function __construct(message, field = null, type = null);
-
 	/**
 	 * Sets message type
 	 *