fixed build

hiqdev · Jan 18, 2016 · bc1ccf9 · bc1ccf9
1 parent 904f2b6
commit bc1ccf9
Show file tree

Hide file tree

Showing 22 changed files with 61 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,29 +1,30 @@
-# vendor dirs
-vendor
-
-# composer lock files
-composer.lock
-
 # hidev internals
 .hidev/composer.json
 .hidev/composer.lock
 .hidev/vendor
 
 # IDE & OS files
 .*.swp
-.idea
-nbproject
+.DS_Store
 .buildpath
+.idea
 .project
 .settings
 Thumbs.db
-.DS_Store
+nbproject
+
+# php-cs-fixer cache
+.php_cs.cache
+
+# vendor dirs
+vendor
+
+# composer lock files
+composer.lock
 
 # phpunit generated files
 coverage.clover
 
-# Codeception generated files
-tests/_support/_generated
-
-# php-cs-fixer cache
-.php_cs.cache
+# PHARs
+php-cs-fixer.phar
+phpunit.phar
diff --git a/.hidev/commits.md b/.hidev/commits.md
@@ -3,6 +3,11 @@ hiqdev/yii2-cart commits history
 
 ## Under development
 
+    - 904f2b6 2015-12-25 Module - added shoppingCartOptions property (d.naumenko.a@gmail.com)
+    - 8982a03 2015-12-25 ShoppingCart - PHPDocs improved (d.naumenko.a@gmail.com)
+    - 06670cf 2015-12-25 CartController::actionUpdateQuantity - fixed broken redirect (d.naumenko.a@gmail.com)
+    - 69b9a1f 2015-12-22 Add bulk Renewal (andreyklochok@gmail.com)
+    - 9820938 2015-12-22 Some changes (andreyklochok@gmail.com)
 - Added configration options to Module
     - 5cc02b9 2015-12-15 added test for get/setOrderButton (sol@hiqdev.com)
     - 213c03b 2015-12-15 fixed travis and tests (sol@hiqdev.com)

diff --git a/.hidev/config.yml b/.hidev/config.yml
@@ -5,6 +5,7 @@ package:
     headline:       Yii2 Cart
     title:          Cart module for Yii2
     keywords:       cart, yii2, extension
+    year:           2015
     description:    |
         [Yii2](http://yiiframework.com) extension providing shopping cart module.
         Uses [omnilight/yii2-shopping-cart](https://github.com/omnilight/yii2-shopping-cart) for shopping cart abstraction.

diff --git a/.php_cs b/.php_cs
@@ -6,7 +6,7 @@ Cart module for Yii2
 @link      https://github.com/hiqdev/yii2-cart
 @package   yii2-cart
 @license   BSD-3-Clause
-@copyright Copyright (c) 2015, HiQDev (http://hiqdev.com/)
+@copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
 EOF;
 
 Symfony\CS\Fixer\Contrib\HeaderCommentFixer::setHeader($header);
@@ -27,6 +27,7 @@ return Symfony\CS\Config\Config::create()
         '-empty_return',                         /// A return statement wishing to return nothing should be simply "return".
         '-return',                               /// An empty line feed should precede a return statement.
         '-phpdoc_params',                        /// All items of the @param, @throws, @return, @var, and @type phpdoc tags must be aligned vertically.
+        '-phpdoc_scalar',                        /// Scalar types should always be written in the same form. "int", not "integer"; "bool", not "boolean".
         '-phpdoc_separation',                    /// Annotations of a different type are separated by a single blank line.
         'header_comment',                        /// Add, replace or remove header comment.
         'concat_with_spaces',                    /// Concatenation should be used with at least one whitespace around.

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -0,0 +1,9 @@
+checks:
+    php:
+        code_rating: true
+        duplication: true
+tools:
+    php_code_coverage:
+        enabled: true
+    external_code_coverage:
+        timeout: 600
diff --git a/.travis.yml b/.travis.yml
@@ -11,13 +11,16 @@ matrix:
 cache:
     directories:
         - $HOME/.composer/cache
+before_install:
+    - 'composer self-update'
+    - 'composer --version'
+    - 'wget http://hiqdev.com/hidev/hidev.phar -O hidev.phar && chmod a+x hidev.phar'
+    - './hidev.phar --version'
+    - './hidev.phar travis/before_install'
 sudo: false
 install:
-    - 'travis_retry composer self-update 1.0.0-alpha11'
-    - 'travis_retry composer global require "fxp/composer-asset-plugin:~1.1" "yiisoft/yii2-composer:~2.0"'
-    - 'wget http://hiqdev.com/hidev/hidev.phar && chmod a+x hidev.phar'
-    - 'travis_retry composer global require "fabpot/php-cs-fixer:*" "phpunit/phpunit-skeleton-generator:*" "phpunit/phpunit:^4.8"'
-    - 'travis_retry composer install --no-interaction'
     - './hidev.phar travis/install'
 script:
     - './hidev.phar travis/script'
+after_script:
+    - './hidev.phar travis/after_script'
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright © 2015, HiQDev (http://hiqdev.com/)
+Copyright © 2015-2016, HiQDev (http://hiqdev.com/)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@ are met:
    notice, this list of conditions and the following disclaimer in
    the documentation and/or other materials provided with the
    distribution.
- * Neither the name of HiQDev nor Yii2 Cart nor the names of its
+ * Neither the name of HiQDev nor the names of its
    contributors may be used to endorse or promote products derived
    from this software without specific prior written permission.
 

diff --git a/README.md b/README.md
@@ -6,6 +6,8 @@ Yii2 Cart
 [![Latest Stable Version](https://poser.pugx.org/hiqdev/yii2-cart/v/stable)](https://packagist.org/packages/hiqdev/yii2-cart)
 [![Total Downloads](https://poser.pugx.org/hiqdev/yii2-cart/downloads)](https://packagist.org/packages/hiqdev/yii2-cart)
 [![Build Status](https://img.shields.io/travis/hiqdev/yii2-cart.svg)](https://travis-ci.org/hiqdev/yii2-cart)
+[![Code Coverage](https://scrutinizer-ci.com/g/hiqdev/yii2-cart/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/hiqdev/yii2-cart/?branch=master)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/hiqdev/yii2-cart/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/hiqdev/yii2-cart/?branch=master)
 [![Dependency Status](https://www.versioneye.com/php/hiqdev:yii2-cart/dev-master/badge.svg)](https://www.versioneye.com/php/hiqdev:yii2-cart/dev-master)
 
 [Yii2](http://yiiframework.com) extension providing shopping cart module.
@@ -34,4 +36,4 @@ to the require section of your composer.json.
 This project is released under the terms of the BSD-3-Clause [license](LICENSE).
 Read more [here](http://choosealicense.com/licenses/bsd-3-clause).
 
-Copyright © 2015, HiQDev (http://hiqdev.com/)
+Copyright © 2015-2016, HiQDev (http://hiqdev.com/)
diff --git a/src/CartPositionInterface.php b/src/CartPositionInterface.php
@@ -6,7 +6,7 @@
  * @link      https://github.com/hiqdev/yii2-cart
  * @package   yii2-cart
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
  */
 
 namespace hiqdev\yii2\cart;

diff --git a/src/CartPositionTrait.php b/src/CartPositionTrait.php
@@ -6,7 +6,7 @@
  * @link      https://github.com/hiqdev/yii2-cart
  * @package   yii2-cart
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
  */
 
 namespace hiqdev\yii2\cart;

diff --git a/src/Module.php b/src/Module.php
@@ -6,7 +6,7 @@
  * @link      https://github.com/hiqdev/yii2-cart
  * @package   yii2-cart
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
  */
 
 namespace hiqdev\yii2\cart;

diff --git a/src/ShoppingCart.php b/src/ShoppingCart.php
@@ -6,7 +6,7 @@
  * @link      https://github.com/hiqdev/yii2-cart
  * @package   yii2-cart
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
  */
 
 namespace hiqdev\yii2\cart;
@@ -15,7 +15,7 @@
 use Yii;
 
 /**
- * Class ShoppingCart
+ * Class ShoppingCart.
  * @property AbstractCartPosition[] $positions
  */
 class ShoppingCart extends \yz\shoppingcart\ShoppingCart

diff --git a/src/actions/AddToCartAction.php b/src/actions/AddToCartAction.php
@@ -6,12 +6,11 @@
  * @link      https://github.com/hiqdev/yii2-cart
  * @package   yii2-cart
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
  */
 
 namespace hiqdev\yii2\cart\actions;
 
-use hipanel\modules\domain\models\Domain;
 use hiqdev\hiart\Collection;
 use hiqdev\yii2\cart\Module;
 use Yii;

diff --git a/src/controllers/CartController.php b/src/controllers/CartController.php
@@ -6,7 +6,7 @@
  * @link      https://github.com/hiqdev/yii2-cart
  * @package   yii2-cart
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
  */
 
 namespace hiqdev\yii2\cart\controllers;
@@ -17,7 +17,7 @@
 use yii\web\NotFoundHttpException;
 
 /**
- * Cart controller
+ * Cart controller.
  *
  * @property ShoppingCart $cart The shopping cart instance
  */

diff --git a/src/grid/QuantityColumn.php b/src/grid/QuantityColumn.php
@@ -6,7 +6,7 @@
  * @link      https://github.com/hiqdev/yii2-cart
  * @package   yii2-cart
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
  */
 
 namespace hiqdev\yii2\cart\grid;

diff --git a/src/messages/ru/cart.php b/src/messages/ru/cart.php
@@ -6,7 +6,7 @@
  * @link      https://github.com/hiqdev/yii2-cart
  * @package   yii2-cart
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
  */
 
 /**

diff --git a/src/widgets/PanelTopCart.php b/src/widgets/PanelTopCart.php
@@ -6,7 +6,7 @@
  * @link      https://github.com/hiqdev/yii2-cart
  * @package   yii2-cart
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
  */
 
 namespace hiqdev\yii2\cart\widgets;

diff --git a/src/widgets/QuantityCell.php b/src/widgets/QuantityCell.php
@@ -6,7 +6,7 @@
  * @link      https://github.com/hiqdev/yii2-cart
  * @package   yii2-cart
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
  */
 
 namespace hiqdev\yii2\cart\widgets;

diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
@@ -6,7 +6,7 @@
  * @link      https://github.com/hiqdev/yii2-cart
  * @package   yii2-cart
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
  */
 
 error_reporting(E_ALL & ~E_NOTICE);

diff --git a/tests/unit/FakeCartPosition.php b/tests/unit/FakeCartPosition.php
@@ -6,7 +6,7 @@
  * @link      https://github.com/hiqdev/yii2-cart
  * @package   yii2-cart
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
  */
 
 namespace hiqdev\yii2\cart\tests\unit;

diff --git a/tests/unit/ModuleTest.php b/tests/unit/ModuleTest.php
@@ -6,7 +6,7 @@
  * @link      https://github.com/hiqdev/yii2-cart
  * @package   yii2-cart
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
  */
 
 namespace hiqdev\yii2\cart\tests\unit;

diff --git a/tests/unit/ShoppingCartTest.php b/tests/unit/ShoppingCartTest.php
@@ -6,7 +6,7 @@
  * @link      https://github.com/hiqdev/yii2-cart
  * @package   yii2-cart
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
  */
 
 namespace hiqdev\yii2\cart\tests\unit;