Merge pull request #515 from phalcon/2.0.x

2.0.8

Author: sergeyklay

CONTRIBUTING.md

@@ -1,18 +1,25 @@
 # Contributing to Phalcon Developer Tools
 
-Phalcon Developer Tools is an open source project and a volunteer effort. Phalcon Developer Tools welcomes contribution from everyone.
+Phalcon Developer Tools is an open source project and a volunteer effort.
 
-Contributions to Phalcon Developer Tools should be made in the form of GitHub pull requests. *We only accept bug reports, new feature requests and pull requests in GitHub*.
+We are welcome contribution from everyone. Contributions to Phalcon Developer Tools should be made in the form of GitHub [pull requests][0].
+*We only accept bug reports, new feature requests and pull requests in GitHub*.
 
-IDE stubs must not be modified manually, if you want to improve them please submit a PR to [cphalcon](https://github.com/phalcon/cphalcon).
+IDE stubs must not be modified manually, if you want to improve them please submit a PR to [cphalcon][1].
 
 ## Getting Support
 
-For questions regarding the usage of the framework or support requests please visit the [official forums](http://forum.phalconphp.com/).
+For questions regarding the usage of the Phalcon Developer Tools or support requests please visit the [official forums][2].
 
 ## Requesting Features
 
-If you have a change or new feature in mind, please fill an [NFR](https://github.com/phalcon/cphalcon/wiki/New-Feature-Request---NFR).
+If you have a change or new feature in mind, please fill an [NFR][3].
 
 Thanks! <br />
 Phalcon Team
+
+
+[0]: https://help.github.com/articles/using-pull-requests/
+[1]: https://github.com/phalcon/cphalcon
+[2]: http://forum.phalconphp.com/
+[3]: https://github.com/phalcon/cphalcon/wiki/New-Feature-Request---NFR

README.md

@@ -77,30 +77,11 @@ chmod +xr ./phalcon.phar
 php ./phalcon.phar
 ```
 
-## Installation via PEAR
+## Installation via Git
 
-Phalcon Devtools can be installed using PEAR. Since the current version of Devtools
-is in beta state, you might need to update your PEAR config. You can execute following to check
-your current state:
+Phalcon Devtools can be installed by using Git.
 
-```bash
-pear config-show | grep preferred_state | awk '{split($0, s, " "); print s[5]}'
-```
-
-If it prints "stable" you need to set the preferred_state to beta:
-
-```bash
-pear config-set preferred_state beta
-```
-
-After that just discover the channel and install the package:
-
-```bash
-pear channel-discover pear.phalconphp.com
-pear install phalcon/Devtools
-```
-
-Alternatively you can just clone the repo and checkout the current branch
+Just clone the repo and checkout the current branch:
 
 ```bash
 cd ~
@@ -122,26 +103,26 @@ chmod ugo+x /usr/bin/phalcon
 To get a list of available commands just execute following:
 
 ```bash
-$ phalcon commands
+$ phalcon commands help
 ```
 
 This command should display something similar to:
 
 ```bash
-Phalcon DevTools (2.0.7)
+Phalcon DevTools (2.0.8)
 
 Help:
   Lists the commands available in Phalcon devtools
 
 Available commands:
-  commands (alias of: list, enumerate)
-  controller (alias of: create-controller)
-  model (alias of: create-model)
-  all-models (alias of: create-all-models)
-  project (alias of: create-project)
-  scaffold (alias of: create-scaffold)
-  migration (alias of: create-migration)
-  webtools (alias of: create-webtools)
+  commands         (alias of: list, enumerate)
+  controller       (alias of: create-controller)
+  model            (alias of: create-model)
+  all-models       (alias of: create-all-models)
+  project          (alias of: create-project)
+  scaffold         (alias of: create-scaffold)
+  migration        (alias of: create-migration)
+  webtools         (alias of: create-webtools)
 ```
 
 ## Update WebTools from old version
@@ -182,4 +163,7 @@ $config = [
 
 ## License
 
-Phalcon Developer Tools is open source software licensed under the New BSD License. See the docs/LICENSE.txt file for more.
+Phalcon Developer Tools is open source software licensed under the [New BSD License][1].
+© Phalcon Framework Team and contributors
+
+[1]: https://github.com/phalcon/phalcon-devtools/blob/master/docs/LICENSE.md

box.json

@@ -1,5 +1,9 @@
 {
-  "directories": "resources",
+  "directories": [
+    "resources",
+    "scripts",
+    "templates"
+  ],
   "files": "webtools.php",
   "finder": [
     {
@@ -9,16 +13,11 @@
         "LICENSE",
         "phalcon.bat",
         "phalcon.sh"
-      ],
-      "in": "scripts",
-      "name": [
-        "*.phtml",
-        "*.php"
       ]
     }
   ],
   "git-version": "git_tag",
   "main": "phalcon.php",
   "output": "phalcon.phar",
   "stub": true
-}
+}

docs/LICENSE.md

@@ -0,0 +1,27 @@
+New BSD License
+---------------
+
+Copyright (c) 2011-2015, Phalcon Team
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Phalcon Team nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL "PHALCON TEAM" BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

ide/2.0.7/Phalcon/FilterInterface.php

@@ -23,7 +23,7 @@ public function add($name, $handler);
      *
      * @param mixed $value 
      * @param mixed $filters 
-     * @return variable 
+     * @return mixed 
      */
     public function sanitize($value, $filters);
 

ide/2.0.7/Phalcon/Registry.php

@@ -65,7 +65,7 @@ public final function offsetExists($offset) {}
      * Returns an index in the registry
      *
      * @param string $offset 
-     * @return variable 
+     * @return mixed 
      */
     public final function offsetGet($offset) {}
 
@@ -132,7 +132,7 @@ public final function __set($key, $value) {}
      * Returns an index in the registry
      *
      * @param string $key 
-     * @return variable 
+     * @return mixed 
      */
     public final function __get($key) {}
 

ide/2.0.7/Phalcon/acl/Resource.php

@@ -32,6 +32,8 @@ public function getName() {}
 
     /**
      * Resource name
+     *
+     * @return string 
      */
     public function __toString() {}
 

ide/2.0.7/Phalcon/acl/Role.php

@@ -32,6 +32,8 @@ public function getName() {}
 
     /**
      * Role name
+     *
+     * @return string 
      */
     public function __toString() {}
 

ide/2.0.7/Phalcon/assets/Collection.php

@@ -265,7 +265,4 @@ public function getRealTargetPath($basePath) {}
      */
     public function addFilter(\Phalcon\Assets\FilterInterface $filter) {}
 
-
-     function zephir_init_properties_Phalcon_Assets_Collection() {}
-
 }

ide/2.0.7/Phalcon/db/RawValue.php

@@ -32,6 +32,8 @@ public function getValue() {}
 
     /**
      * Raw value without quoting or formating
+     *
+     * @return string 
      */
     public function __toString() {}