csfixed

.gitignore

@@ -1,6 +1,7 @@
 # hidev internals
 .hidev/composer.json
 .hidev/composer.lock
+.hidev/config-local.yml
 .hidev/vendor
 
 # IDE & OS files
@@ -13,15 +14,19 @@
 Thumbs.db
 nbproject
 
-# php-cs-fixer cache
-.php_cs.cache
+# HiSite directories
+/runtime/*
+/web/assets/*
 
 # vendor dirs
 vendor
 
 # composer lock files
 composer.lock
 
+# php-cs-fixer cache
+.php_cs.cache
+
 # phpunit generated files
 coverage.clover
 
@@ -30,3 +35,7 @@ composer.phar
 php-cs-fixer.phar
 phpunit-skelgen.phar
 phpunit.phar
+
+# Binaries
+chkipper.phar
+ocular.phar

.hidev/config.yml

@@ -11,7 +11,3 @@ package:
         [HiPanel](http://hipanel.com) is next generation control panel for hosting, domains and more.
 
         This package provides domain management for HiPanel.
-
-require:
-    hiqdev/hidev-php:    "*"
-    hiqdev/hidev-vendor: "*"

.php_cs

@@ -6,49 +6,49 @@ Domain plugin for HiPanel
 @link      https://github.com/hiqdev/hipanel-module-domain
 @package   hipanel-module-domain
 @license   BSD-3-Clause
-@copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
+@copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
 EOF;
 
-Symfony\CS\Fixer\Contrib\HeaderCommentFixer::setHeader($header);
-
-return Symfony\CS\Config\Config::create()
+return PhpCsFixer\Config::create()
     ->setUsingCache(true)
-    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
-    ->fixers([
-        '-long_array_syntax',                    /// Arrays should use the long syntax
-        '-php4_constructor',                     /// Convert PHP4-style constructors to __construct. Warning! This could change code behavior
-        '-phpdoc_var_to_type',                   /// @var should always be written as @type
-        '-align_double_arrow',                   /// Align double arrow symbols in consecutive lines
-        '-unalign_double_arrow',                 /// Unalign double arrow symbols in consecutive lines
-        '-align_equals',                         /// Align equals symbols in consecutive lines
-        '-unalign_equals',                       /// Unalign equals symbols in consecutive lines
-        '-blankline_after_open_tag',             /// Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline
-        '-phpdoc_no_empty_return',               /// @return void and @return null annotations should be omitted from phpdocs
-        '-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
-        '-phpdoc_to_comment',                    /// Docblocks should only be used on structural elements
-        'header_comment',                        /// Add, replace or remove header comment
-        'concat_with_spaces',                    /// Concatenation should be used with at least one whitespace around
-        'ereg_to_preg',                          /// Replace deprecated ereg regular expression functions with preg. Warning! This could change code behavior
-        'multiline_spaces_before_semicolon',     /// Multi-line whitespace before closing semicolon are prohibited
-        'newline_after_open_tag',                /// Ensure there is no code on the same line as the PHP open tag
-        'single_blank_line_before_namespace',    /// There should be no blank lines before a namespace declaration
-        'ordered_use',                           /// Ordering use statements
-        'phpdoc_order',                          /// Annotations in phpdocs should be ordered so that @param come first, then @throws, then @return
-        'pre_increment',                         /// Pre incrementation/decrementation should be used if possible
-        'short_array_syntax',                    /// PHP arrays should use the PHP 5.4 short-syntax
-        'strict',                                /// Comparison should be strict. Warning! This could change code behavior
-        'strict_param',                          /// Functions should be used with $strict param. Warning! This could change code behavior
-    ])
-    ->finder(
-        Symfony\CS\Finder\DefaultFinder::create()
+    ->setRiskyAllowed(true)
+    ->setRules(array(
+        '@Symfony' => true,
+        'header_comment'                             =>  [
+            'header'        => $header,
+            'separate'      => 'bottom',
+            'location'      => 'after_declare_strict',
+            'commentType'   => 'PHPDoc',
+        ],
+        'binary_operator_spaces'                     =>  [
+            'align_double_arrow' => null,
+            'align_equals'       => null,
+        ],
+        'concat_space'                               =>  ['spacing' => 'one'],
+        'array_syntax'                               =>  ['syntax' => 'short'],
+        'empty_return'                               =>  false,
+        'blank_line_before_return'                   =>  false,
+        'phpdoc_align'                               =>  false,
+        'phpdoc_params'                              =>  false,
+        'phpdoc_scalar'                              =>  false,
+        'phpdoc_separation'                          =>  false,
+        'phpdoc_to_comment'                          =>  false,
+        'method_argument_space'                      =>  false,
+        'ereg_to_preg'                               =>  true,
+        'blank_line_after_opening_tag'               =>  true,
+        'single_blank_line_before_namespace'         =>  true,
+        'ordered_imports'                            =>  true,
+        'phpdoc_order'                               =>  true,
+        'pre_increment'                              =>  true,
+        'strict_comparison'                          =>  true,
+        'strict_param'                               =>  true,
+        'no_multiline_whitespace_before_semicolons'  =>  true,
+    ))
+    ->setFinder(
+        PhpCsFixer\Finder::create()
             ->in(__DIR__)
             ->notPath('vendor')
             ->notPath('runtime')
             ->notPath('web/assets')
-            ->notPath('tests/unit/UnitTester.php')
-    )
+        )
 ;

LICENSE

@@ -1,4 +1,4 @@
-Copyright © 2015-2016, HiQDev (http://hiqdev.com/)
+Copyright © 2015-2017, HiQDev (http://hiqdev.com/)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -39,4 +39,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-2016, HiQDev (http://hiqdev.com/)
+Copyright © 2015-2017, HiQDev (http://hiqdev.com/)

composer.json

@@ -26,19 +26,19 @@
         {
             "name": "Dmitry Naumenko",
             "role": "Lead backend developer",
-            "email": "silverfire@hiqdev.com",
+            "email": "d.naumenko.a@gmail.com",
             "homepage": "http://silverfire.me/"
         },
         {
             "name": "Andrey Klochok",
             "role": "Lead frontend developer",
-            "email": "tafid@hiqdev.com",
+            "email": "andreyklochok@gmail.com",
             "homepage": "http://hiqdev.com/"
         },
         {
             "name": "Yuriy Myronchuk",
             "role": "QA Lead",
-            "email": "bladeroot@hiqdev.com",
+            "email": "bladeroot@gmail.com",
             "homepage": "http://hiqdev.com/"
         }
     ],
@@ -49,8 +49,8 @@
         "seostats/seostats": "dev-master"
     },
     "require-dev": {
-        "hiqdev/hidev-php": "<2.0",
-        "hiqdev/hidev-vendor": "<2.0"
+        "hiqdev/hidev-php": "<2.0 || dev-master",
+        "hiqdev/hidev-hiqdev": "<2.0 || dev-master"
     },
     "autoload": {
         "psr-4": {

src/Module.php

@@ -1,12 +1,11 @@
 <?php
-
-/*
+/**
  * Domain plugin for HiPanel
  *
  * @link      https://github.com/hiqdev/hipanel-module-domain
  * @package   hipanel-module-domain
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
 namespace hipanel\modules\domain;

src/actions/DomainOptionSwitcherAction.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Domain plugin for HiPanel
+ *
+ * @link      https://github.com/hiqdev/hipanel-module-domain
+ * @package   hipanel-module-domain
+ * @license   BSD-3-Clause
+ * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
+ */
 
 namespace hipanel\modules\domain\actions;
 
@@ -31,7 +39,7 @@ protected function getDefaultRules()
                         $message = Yii::$app->session->removeFlash('error');
                         return [
                             'success' => false,
-                            'text' => reset($message)['text']
+                            'text' => reset($message)['text'],
                         ];
                     },
                 ],

src/assets/DomainCheckPluginAsset.php

@@ -1,12 +1,11 @@
 <?php
-
-/*
+/**
  * Domain plugin for HiPanel
  *
  * @link      https://github.com/hiqdev/hipanel-module-domain
  * @package   hipanel-module-domain
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
 namespace hipanel\modules\domain\assets;

src/assets/NSyncPluginAsset.php

@@ -1,12 +1,11 @@
 <?php
-
-/*
+/**
  * Domain plugin for HiPanel
  *
  * @link      https://github.com/hiqdev/hipanel-module-domain
  * @package   hipanel-module-domain
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
 namespace hipanel\modules\domain\assets;

src/assets/WhoisAsset.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Domain plugin for HiPanel
+ *
+ * @link      https://github.com/hiqdev/hipanel-module-domain
+ * @package   hipanel-module-domain
+ * @license   BSD-3-Clause
+ * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
+ */
 
 namespace hipanel\modules\domain\assets;
 

src/cart/AbstractDomainProduct.php

@@ -1,17 +1,15 @@
 <?php
-
-/*
+/**
  * Domain plugin for HiPanel
  *
  * @link      https://github.com/hiqdev/hipanel-module-domain
  * @package   hipanel-module-domain
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
 namespace hipanel\modules\domain\cart;
 
-use hipanel\modules\domain\cart\Calculation;
 use hipanel\modules\domain\models\Domain;
 use hipanel\modules\finance\cart\AbstractCartPosition;
 use Yii;

src/cart/AbstractDomainPurchase.php

@@ -1,12 +1,11 @@
 <?php
-
-/*
+/**
  * Domain plugin for HiPanel
  *
  * @link      https://github.com/hiqdev/hipanel-module-domain
  * @package   hipanel-module-domain
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
 namespace hipanel\modules\domain\cart;

src/cart/Calculation.php

@@ -1,12 +1,11 @@
 <?php
-
-/*
+/**
  * Domain plugin for HiPanel
  *
  * @link      https://github.com/hiqdev/hipanel-module-domain
  * @package   hipanel-module-domain
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
 namespace hipanel\modules\domain\cart;

src/cart/DomainRegistrationProduct.php

@@ -1,17 +1,15 @@
 <?php
-
-/*
+/**
  * Domain plugin for HiPanel
  *
  * @link      https://github.com/hiqdev/hipanel-module-domain
  * @package   hipanel-module-domain
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
 namespace hipanel\modules\domain\cart;
 
-use hipanel\modules\domain\cart\DomainRegistrationPurchase;
 use Yii;
 
 class DomainRegistrationProduct extends AbstractDomainProduct

src/cart/DomainRegistrationPurchase.php

@@ -1,12 +1,11 @@
 <?php
-
-/*
+/**
  * Domain plugin for HiPanel
  *
  * @link      https://github.com/hiqdev/hipanel-module-domain
  * @package   hipanel-module-domain
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
 namespace hipanel\modules\domain\cart;

src/cart/DomainRenewalProduct.php

@@ -1,12 +1,11 @@
 <?php
-
-/*
+/**
  * Domain plugin for HiPanel
  *
  * @link      https://github.com/hiqdev/hipanel-module-domain
  * @package   hipanel-module-domain
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
 namespace hipanel\modules\domain\cart;
@@ -30,7 +29,7 @@ public static function primaryKey()
     }
 
     /**
-     * @var integer[] The limit of days before expiration date for each domain zone, when domain can be renewed.
+     * @var integer[] the limit of days before expiration date for each domain zone, when domain can be renewed
      */
     protected $daysBeforeExpire = [
         'ru' => 56,
@@ -80,7 +79,7 @@ public function getPurchaseModel($options = [])
     }
 
     /**
-     * Checks whether domain reached the limit of days before expiration date and can be renewed
+     * Checks whether domain reached the limit of days before expiration date and can be renewed.
      *
      * @param $attribute
      * @return bool

src/cart/DomainRenewalPurchase.php

@@ -1,12 +1,11 @@
 <?php
-
-/*
+/**
  * Domain plugin for HiPanel
  *
  * @link      https://github.com/hiqdev/hipanel-module-domain
  * @package   hipanel-module-domain
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
 namespace hipanel\modules\domain\cart;