Merge pull request #2 from vegas-cmf/v1.1

V1.1

.travis.yml

@@ -1,7 +1,7 @@
 language: php
 
 php:
-  - 5.6
+  - 5.4
 
 services:
   - mongodb

composer.json

@@ -23,7 +23,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "4.0.*",
-        "satooshi/php-coveralls": "dev-master",
+        "satooshi/php-coveralls": "^1.0",
         "ext-mongo": ">=1.5"
     },
     "autoload": {

src/Cli/Loader.php

@@ -107,7 +107,7 @@ private function toNamespace($str) {
         $stringParts = preg_split('/_+/', $str);
 
         foreach($stringParts as $key => $stringPart){
-            $stringParts[$key] = ucfirst(strtolower($stringPart));
+            $stringParts[$key] = \Phalcon\Text::camelize($stringPart);
         }
         return implode('\\', $stringParts) . '\\';
     }

src/DI/ServiceManager.php

@@ -10,6 +10,8 @@
  * $this->serviceManager->getService('foo:barBaz');
  * // or in view
  * {{ serviceManager.getService('foo:barBaz') }}
+ * // or using extra params for __construct()
+ * {{ serviceManager.getService('foo:barBaz', ['param1', 'param2']) }}
  * </code>
  * 
  * @author Arkadiusz Ostrycharz <aostrycharz@amsterdam-standard.pl>
@@ -35,28 +37,30 @@ class ServiceManager implements InjectionAwareInterface
     /**
      * Alias for getService.
      *
-     * @param $name
+     * @param string $name
+     * @param array $parameters
      * @return object
      */
-    public function get($name)
+    public function get($name, array $parameters = [])
     {
-        return $this->getService($name);
+        return $this->getService($name, $parameters);
     }
 
     /**
      * Try to register and return service.
      *
-     * @param $name
+     * @param string $name
+     * @param array $parameters
      * @return object
      * @throws Service\Exception
      */
-    public function getService($name)
+    public function getService($name, array $parameters = [])
     {
         try {
             if (!$this->isRegisteredService($name)) {
                 $this->registerService($name);
             }
-            return $this->di->get($name);
+            return $this->di->get($name, $parameters);
         } catch (\Phalcon\DI\Exception $ex) {
             throw new Exception($ex->getMessage().', using: '.$name);
         }

src/Tag/Pagination.php

@@ -177,7 +177,7 @@ private function renderElement($page, $title, $class = '')
 
     private function getUrlParams()
     {
-        $arguments = $this->di->get('request')->get();
+        $arguments = $this->di->get('request')->getQuery();
         unset($arguments['_url']);
         unset($arguments['page']);
 

src/Util/FileWriter.php

@@ -32,10 +32,8 @@ class FileWriter
      */
     public static function write($filePath, $content, $compareContents = false)
     {
-        if ($compareContents) {
-            if (self::compareContents($filePath, $content)) {
-                return 0;
-            }
+        if ($compareContents && self::compareContents($filePath, $content)) {
+            return 0;
         }
 
         return file_put_contents($filePath, $content);

tests/Tag/PaginationTest.php

@@ -19,7 +19,7 @@
 
 class RequestMock
 {
-    public function get()
+    public function getQuery()
     {
         return [
             'by' => 'name',