Merge pull request #933 from phalcon/3.0.x

3.0.3

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,27 +5,29 @@ Hello!
 
 This pull request affects the following components: **(please check boxes)**
 
-* [ ] Core
-* [ ] WebTools
-* [ ] Migrations
-* [ ] Models
-* [ ] Scaffold
-* [ ] Documentation
-* [ ] IDE
-* [ ] MySQL
-* [ ] PostgreSQL
-* [ ] Oracle
-* [ ] SQLite
-* [ ] Testing
-* [ ] Code Quality
-* [ ] Templating
+- [ ] Core
+- [ ] WebTools
+- [ ] Migrations
+- [ ] Models
+- [ ] Scaffold
+- [ ] Documentation
+- [ ] IDE
+- [ ] MySQL
+- [ ] PostgreSQL
+- [ ] Oracle
+- [ ] SQLite
+- [ ] Testing
+- [ ] Code Quality
+- [ ] Templating
 
 **In raising this pull request, I confirm the following (please check boxes):**
 
-- [ ] I have read and understood the [Contributing Guidelines](https://github.com/phalcon/phalcon-devtools/blob/master/CONTRIBUTING.md)?
+- [ ] I have read and understood the [Contributing Guidelines][:contrib:]?
 - [ ] I have checked that another pull request for this purpose does not exist.
 - [ ] I wrote some tests for this PR.
 
 Small description of change:
 
 Thanks
+
+[:contrib:]: https://github.com/phalcon/phalcon-devtools/blob/master/CONTRIBUTING.md

composer.json

@@ -33,5 +33,5 @@
             "Phalcon\\" : "scripts/Phalcon/"
         }
     },
-    "bin": ["phalcon.php", "phalcon"]
+    "bin": ["phalcon.php"]
 }

ide/stubs/Phalcon/Acl.php

@@ -4,33 +4,44 @@
 
 /**
  * Phalcon\Acl
+ *
  * This component allows to manage ACL lists. An access control list (ACL) is a list
  * of permissions attached to an object. An ACL specifies which users or system processes
  * are granted access to objects, as well as what operations are allowed on given objects.
+ *
  * <code>
  * use Phalcon\Acl;
  * use Phalcon\Acl\Role;
  * use Phalcon\Acl\Resource;
  * use Phalcon\Acl\Adapter\Memory;
+ *
  * $acl = new Memory();
+ *
  * // Default action is deny access
  * $acl->setDefaultAction(Acl::DENY);
+ *
  * // Create some roles
  * $roleAdmins = new Role("Administrators", "Super-User role");
  * $roleGuests = new Role("Guests");
+ *
  * // Add "Guests" role to acl
  * $acl->addRole($roleGuests);
+ *
  * // Add "Designers" role to acl
  * $acl->addRole("Designers");
+ *
  * // Define the "Customers" resource
  * $customersResource = new Resource("Customers", "Customers management");
+ *
  * // Add "customers" resource with a couple of operations
  * $acl->addResource($customersResource, "search");
  * $acl->addResource($customersResource, ["create", "update"]);
+ *
  * // Set access level for roles into resources
  * $acl->allow("Guests", "Customers", "search");
  * $acl->allow("Guests", "Customers", "create");
  * $acl->deny("Guests", "Customers", "update");
+ *
  * // Check whether role has access to the operations
  * $acl->isAllowed("Guests", "Customers", "edit"); // Returns 0
  * $acl->isAllowed("Guests", "Customers", "search"); // Returns 1

ide/stubs/Phalcon/Application.php

@@ -4,6 +4,7 @@
 
 /**
  * Phalcon\Application
+ *
  * Base class for Phalcon\Cli\Console and Phalcon\Mvc\Application.
  */
 abstract class Application extends \Phalcon\Di\Injectable implements \Phalcon\Events\EventsAwareInterface
@@ -28,75 +29,76 @@ abstract class Application extends \Phalcon\Di\Injectable implements \Phalcon\Ev
     /**
      * Phalcon\Application
      *
-     * @param mixed $dependencyInjector 
+     * @param \Phalcon\DiInterface $dependencyInjector
      */
     public function __construct(\Phalcon\DiInterface $dependencyInjector = null) {}
 
     /**
      * Sets the events manager
      *
-     * @param mixed $eventsManager 
-     * @return Application 
+     * @param \Phalcon\Events\ManagerInterface $eventsManager
+     * @return Application
      */
     public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager) {}
 
     /**
      * Returns the internal event manager
      *
-     * @return \Phalcon\Events\ManagerInterface 
+     * @return \Phalcon\Events\ManagerInterface
      */
     public function getEventsManager() {}
 
     /**
      * Register an array of modules present in the application
+     *
      * <code>
      * $this->registerModules(
-     * [
-     * "frontend" => [
-     * "className" => "Multiple\\Frontend\\Module",
-     * "path"      => "../apps/frontend/Module.php",
-     * ],
-     * "backend" => [
-     * "className" => "Multiple\\Backend\\Module",
-     * "path"      => "../apps/backend/Module.php",
-     * ],
-     * ]
+     *     [
+     *         "frontend" => [
+     *             "className" => "Multiple\\Frontend\\Module",
+     *             "path"      => "../apps/frontend/Module.php",
+     *         ],
+     *         "backend" => [
+     *             "className" => "Multiple\\Backend\\Module",
+     *             "path"      => "../apps/backend/Module.php",
+     *         ],
+     *     ]
      * );
      * </code>
      *
-     * @param array $modules 
-     * @param bool $merge 
-     * @return Application 
+     * @param array $modules
+     * @param bool $merge
+     * @return Application
      */
     public function registerModules(array $modules, $merge = false) {}
 
     /**
      * Return the modules registered in the application
      *
-     * @return array 
+     * @return array
      */
     public function getModules() {}
 
     /**
      * Gets the module definition registered in the application via module name
      *
-     * @param string $name 
-     * @return array|object 
+     * @param string $name
+     * @return array|object
      */
     public function getModule($name) {}
 
     /**
      * Sets the module name to be used if the router doesn't return a valid module
      *
-     * @param string $defaultModule 
-     * @return Application 
+     * @param string $defaultModule
+     * @return Application
      */
     public function setDefaultModule($defaultModule) {}
 
     /**
      * Returns the default module name
      *
-     * @return string 
+     * @return string
      */
     public function getDefaultModule() {}