Merge pull request #467 from bluzphp/develop

Added support Windows for tests

Author: Anton

.travis.yml

@@ -27,16 +27,14 @@ before_script:
   - chmod a+w ./tests/_output
 script:
   # Check code style
-  #- php vendor/bin/phpcs --report=xml --report-file=.reports/phpcs.xml
-  # Mess detection
-  #- php vendor/bin/phpmd ./src xml codesize,unusedcode,naming --reportfile .reports/phpmd.xml || true
+  - php vendor/bin/phpcs ./src --standard=PSR1,PSR2 --encoding=utf-8
   # Complexity of code
   - php vendor/bin/phploc ./src
   # Run CodeCeption tests
   - php vendor/bin/codecept run --coverage --coverage-xml
 after_success:
   # Upload coverage report
-  - php vendor/bin/coveralls -v
+  - php vendor/bin/php-coveralls -v
   - wget https://scrutinizer-ci.com/ocular.phar
   - php ocular.phar code-coverage:upload --format=php-clover tests/_output/coverage.xml
   # Generate documentation

composer.json

@@ -10,15 +10,14 @@
         "ext-ctype": "*",
         "cache/cache": "~1.0",
         "psr/log": "~1.0",
-        "zendframework/zend-diactoros": "~2.0",
+        "zendframework/zend-diactoros": "~2.1.1",
         "zendframework/zend-httphandlerrunner": "~1.0"
     },
     "require-dev": {
         "codeception/codeception": "2.5.3",
         "php-coveralls/php-coveralls": "~2.1",
         "squizlabs/php_codesniffer": "~3.3",
-        "phploc/phploc": "~4.0",
-        "phpmd/phpmd": "~2.6"
+        "phploc/phploc": "~4.0"
     },
     "suggest": {
         "ext-gettext": "required by Bluz\\Translator (https://github.com/bluzphp/framework/wiki/Translator)",

src/Grid/Grid.php

@@ -269,7 +269,7 @@ public function getModule(): ?string
     /**
      * Set controller
      *
-     * @param  string $controller
+     * @param string $controller
      *
      * @return void
      */
@@ -321,15 +321,18 @@ public function processRequest(): void
         foreach ($this->allowOrders as $column) {
             $alias = $this->applyAlias($column);
             $order = Request::getParam($this->prefix . 'order-' . $alias);
+            if (is_array($order)) {
+                $order = current($order);
+            }
             if (null !== $order) {
                 $this->addOrder($column, $order);
             }
         }
         foreach ($this->allowFilters as $column) {
             $alias = $this->applyAlias($column);
-            $filter = Request::getParam($this->prefix . 'filter-' . $alias);
+            $filters = (array)Request::getParam($this->prefix . 'filter-' . $alias, []);
 
-            if (null !== $filter) {
+            foreach ($filters as $filter) {
                 $filter = trim($filter, ' _-');
                 if (strpos($filter, '-')) {
                     /**

src/Proxy/Mailer.php

@@ -31,10 +31,10 @@
  *
  * @method   static Instance getInstance()
  *
- * @method   static \PHPMailer create()
+ * @method   static \PHPMailer\PHPMailer\PHPMailer create()
  * @see      Instance::create()
  *
- * @method   static bool send(\PHPMailer $mail)
+ * @method   static bool send(\PHPMailer\PHPMailer\PHPMailer $mail)
  * @see      Instance::send()
  */
 final class Mailer

src/Proxy/Request.php

@@ -12,7 +12,6 @@
 
 use Bluz\Common\Exception\ComponentException;
 use Bluz\Http\RequestMethod;
-use Bluz\Request\RequestFactory;
 use Psr\Http\Message\UriInterface;
 use Zend\Diactoros\ServerRequest as Instance;
 
@@ -50,12 +49,12 @@ final class Request
     /**
      * @var array|null Accepted type
      */
-    static private $accept;
+    private static $accept;
 
     /**
      * @var array|null Accepted languages
      */
-    static private $language;
+    private static $language;
 
     /**
      * Init instance
@@ -75,7 +74,7 @@ private static function initInstance()
      * @param  string $key
      * @param  string $default Default value to use if key not found
      *
-     * @return string Returns null if key does not exist
+     * @return string|array|null Returns null if key does not exist
      */
     public static function getQuery($key = null, $default = null)
     {
@@ -90,7 +89,7 @@ public static function getQuery($key = null, $default = null)
      * @param  string $key
      * @param  string $default Default value to use if key not found
      *
-     * @return string Returns null if key does not exist
+     * @return string|array|null Returns null if key does not exist
      */
     public static function getPost($key = null, $default = null)
     {
@@ -169,7 +168,7 @@ public static function getHeader($header, $default = null)
      * @param  string $key
      * @param  null   $default
      *
-     * @return string|null
+     * @return string|array|null
      * @link http://msdn.microsoft.com/en-us/library/system.web.httprequest.item.aspx
      */
     public static function getParam($key, $default = null)
@@ -185,11 +184,11 @@ public static function getParam($key, $default = null)
      *
      * @return array
      */
-    public static function getParams()
+    public static function getParams(): array
     {
         $body = (array)self::getInstance()->getParsedBody();
         $query = (array)self::getInstance()->getQueryParams();
-        return array_merge($body, $query);
+        return array_merge([], $body, $query);
     }
 
     /**
@@ -303,7 +302,7 @@ private static function parseAcceptHeader($header): array
             // the default quality is 1.
             $q = 1;
             // check if there is a different quality
-            if (strpos($a, ';q=') or strpos($a, '; q=')) {
+            if (strpos($a, ';q=') || strpos($a, '; q=')) {
                 // divide "mime/type;q=X" into two parts: "mime/type" i "X"
                 [$a, $q] = preg_split('/;([ ]?)q=/', $a);
             }

src/Proxy/Response.php

@@ -125,7 +125,7 @@ public static function redirect($url): void
      * @return void
      * @throws RedirectException
      */
-    public static function redirectTo($module = 'index', $controller = 'index', array $params = []): void
+    public static function redirectTo($module, $controller = 'index', array $params = []): void
     {
         $url = Router::getFullUrl($module, $controller, $params);
         self::redirect($url);

tests/_bootstrap.php

@@ -2,14 +2,14 @@
 // This is global bootstrap for autoloading
 // Environment
 define('DEBUG', true);
-error_reporting(E_ALL | E_STRICT);
+error_reporting(E_ALL);
 ini_set('display_errors', 1);
 
 // Paths
 define('PATH_ROOT', realpath(dirname(__DIR__)));
-define('PATH_APPLICATION', PATH_ROOT . '/tests');
-define('PATH_VENDOR', PATH_ROOT . '/vendor');
+define('PATH_APPLICATION', PATH_ROOT . DIRECTORY_SEPARATOR . 'tests');
+define('PATH_VENDOR', PATH_ROOT . DIRECTORY_SEPARATOR . 'vendor');
 
 // Use composer autoload
 $loader = require PATH_ROOT . '/vendor/autoload.php';
-$loader->addPsr4('Bluz\\Tests\\', __DIR__ . '/src');
+$loader->addPsr4('Bluz\\Tests\\', __DIR__ . DIRECTORY_SEPARATOR . 'src');