Merge pull request #455 from phalcon/2.0.x

2.0.6

Author: sergeyklay

.gitignore

@@ -1,2 +1,3 @@
 .idea
 .DS_Store
+phalcon.phar

README.md

@@ -61,6 +61,22 @@ ln -s ~/devtools/phalcon.php /usr/bin/phalcon
 chmod ugo+x /usr/bin/phalcon
 ```
 
+## Build `.phar`
+
+Install composer and box in a common location or in your project:
+```bash
+curl -s http://getcomposer.org/installer | php
+bin/composer install
+```
+
+Build phar file `phalcon-devtools`
+```bash
+bin/box build -v
+chmod +xr ./phalcon.phar
+# Test it!
+php ./phalcon.phar
+```
+
 ## Installation via PEAR
 
 Phalcon Devtools can be installed using PEAR. Since the current version of Devtools

box.json

@@ -0,0 +1,24 @@
+{
+  "directories": "resources",
+  "files": "webtools.php",
+  "finder": [
+    {
+      "exclude": [
+        "CONTRIBUTING.md",
+        "README.md",
+        "LICENSE",
+        "phalcon.bat",
+        "phalcon.sh"
+      ],
+      "in": "scripts",
+      "name": [
+        "*.phtml",
+        "*.php"
+      ]
+    }
+  ],
+  "git-version": "git_tag",
+  "main": "phalcon.php",
+  "output": "phalcon.phar",
+  "stub": true
+}

composer.json

@@ -2,9 +2,9 @@
     "name": "phalcon/devtools",
     "type": "library",
     "description": "This tools provide you useful scripts to generate code helping to develop faster and easy applications that use with Phalcon framework.",
-    "keywords": ["framework", "phalcon", "devtools", "webtools"],
+    "keywords": ["framework", "phalcon", "devtools", "webtools", "phar"],
     "homepage": "http://phalconphp.com",
-    "license": "BSD-3",
+    "license": "BSD-3-Clause",
     "authors": [
         {
             "name": "Phalcon Team",
@@ -15,6 +15,9 @@
         "php": ">=5.3.9",
         "ext-phalcon": "~2.0"
     },
+    "require-dev": {
+        "box": ">=2.5.2"
+    },
     "autoload": {
         "psr-0" : {
             "Phalcon" : "scripts/"

ide/2.0.0/Phalcon/db/Column.php

@@ -49,6 +49,11 @@ class Column implements \Phalcon\Db\ColumnInterface
      */
     const TYPE_BOOLEAN = 8;
 
+    /**
+     * Double abstract data type
+     */
+    const TYPE_DOUBLE = 9;
+
     /**
      * Bind Type Null
      */

ide/2.0.0/Phalcon/paginator/AdapterInterface.php

@@ -4,40 +4,38 @@
 
 interface AdapterInterface
 {
-
     /**
      * Phalcon\Paginator\AdapterInterface constructor
      *
-     * @param array $config 
+     * @param array $config
      */
-	public function __construct($config);
+    public function __construct(array $config);
 
     /**
      * Set the current page number
      *
-     * @param int $page 
+     * @param int $page
      */
-	public function setCurrentPage($page);
+    public function setCurrentPage($page);
 
     /**
      * Returns a slice of the resultset to show in the pagination
      *
-     * @return \stdClass 
+     * @return \stdClass
      */
-	public function getPaginate();
+    public function getPaginate();
 
     /**
      * Set current rows limit
      *
-     * @param int $limit 
+     * @param int $limit
      */
-	public function setLimit($limit);
+    public function setLimit($limit);
 
     /**
      * Get current rows limit
      *
-     * @return int 
+     * @return int
      */
-	public function getLimit();
-
+    public function getLimit();
 }

ide/2.0.2/Phalcon/Acl.php

@@ -0,0 +1,11 @@
+<?php 
+
+namespace Phalcon {
+
+	abstract class Acl {
+
+		const ALLOW = 1;
+
+		const DENY = 0;
+	}
+}

ide/2.0.2/Phalcon/Acl/Adapter.php

@@ -0,0 +1,70 @@
+<?php 
+
+namespace Phalcon\Acl {
+
+	/**
+	 * Phalcon\Acl\Adapter
+	 *
+	 * Adapter for Phalcon\Acl adapters
+	 */
+	
+	abstract class Adapter implements \Phalcon\Acl\AdapterInterface, \Phalcon\Events\EventsAwareInterface {
+
+		protected $_eventsManager;
+
+		protected $_defaultAccess;
+
+		protected $_accessGranted;
+
+		protected $_activeRole;
+
+		protected $_activeResource;
+
+		protected $_activeAccess;
+
+		/**
+		 * Role which the list is checking if it's allowed to certain resource/access
+		 * @var mixed
+		 */
+		public function getActiveRole(){ }
+
+
+		/**
+		 * Resource which the list is checking if some role can access it
+		 * @var mixed
+		 */
+		public function getActiveResource(){ }
+
+
+		/**
+		 * Active access which the list is checking if some role can access it
+		 * @var mixed
+		 */
+		public function getActiveAccess(){ }
+
+
+		/**
+		 * Sets the events manager
+		 */
+		public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager){ }
+
+
+		/**
+		 * Returns the internal event manager
+		 */
+		public function getEventsManager(){ }
+
+
+		/**
+		 * Sets the default access level (Phalcon\Acl::ALLOW or \Phalcon\Acl::DENY)
+		 */
+		public function setDefaultAction($defaultAccess){ }
+
+
+		/**
+		 * Returns the default ACL access level
+		 */
+		public function getDefaultAction(){ }
+
+	}
+}