coderius / yii2-hit-counter

src/components/deviceDetect/IDeviceDetect.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 namespace coderius\hitCounter\components\deviceDetect;
 
-interface IDeviceDetect{
+interface IDeviceDetect {
     
     public function getOs();
 

src/components/deviceDetect/DeviceDetector.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 use  DeviceDetector\Parser\Device\DeviceParserAbstract;
 use yii\base\Component;
 
-class DeviceDetector extends  Component implements IDeviceDetect{
+class DeviceDetector extends  Component implements IDeviceDetect {
 
     private $detector;
 

src/models/HitCounterModel.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 use yii\base\Model;
 use coderius\hitCounter\Module;
 
-class HitCounterModel extends Model{
+class HitCounterModel extends Model {
     // const SCENARIO_CREATE = 'create';
     // const SCENARIO_UPDATE = 'update';
 
@@ -62,12 +62,12 @@ 
         return [
             [['counter_id'], 'required'],
             [['js_cookei_enabled', 'js_java_enabled', 'js_timezone_offset', 'js_screen_width', 'js_screen_height', 'js_color_depth', 'js_history_length', 'js_is_toutch_device', 'js_processor_ram', 'serv_auth_user_id', 'serv_is_proxy_or_vpn', 'serv_port'], 'integer'],
-            [['serv_cookies','js_current_url', 'js_referer_url','serv_referer_url','serv_user_agent'], 'string'],
-            [['counter_id', 'js_timezone', 'js_connection', 'js_browser_language',  'serv_server_name', 'serv_os', 'serv_client', 'serv_device', 'serv_brand', 'serv_model', 'serv_bot', 'serv_host_by_ip'], 'string', 'max' => 255],
+            [['serv_cookies', 'js_current_url', 'js_referer_url', 'serv_referer_url', 'serv_user_agent'], 'string'],
+            [['counter_id', 'js_timezone', 'js_connection', 'js_browser_language', 'serv_server_name', 'serv_os', 'serv_client', 'serv_device', 'serv_brand', 'serv_model', 'serv_bot', 'serv_host_by_ip'], 'string', 'max' => 255],
             [['cookie_mark'], 'string', 'max' => 32],
             [['serv_ip'], 'string', 'max' => 20],
             [['serv_auth_user_id'], 'exist', 'skipOnError' => true, 'targetClass' => Module::getInstance()->userIdentityClass, 'targetAttribute' => ['serv_auth_user_id' => 'id']],
-            [['cookie_mark', 'js_current_url', 'serv_ip', 'js_timezone_offset','js_timezone', 'js_connection','js_referer_url','js_screen_width','js_screen_height','js_color_depth','js_browser_language','js_history_length','js_processor_ram','serv_user_agent','serv_referer_url','serv_server_name','serv_auth_user_id','serv_port','serv_cookies','serv_os','serv_client','serv_device','serv_brand','serv_model','serv_bot','serv_host_by_ip'], 'default', 'value' => null],
+            [['cookie_mark', 'js_current_url', 'serv_ip', 'js_timezone_offset', 'js_timezone', 'js_connection', 'js_referer_url', 'js_screen_width', 'js_screen_height', 'js_color_depth', 'js_browser_language', 'js_history_length', 'js_processor_ram', 'serv_user_agent', 'serv_referer_url', 'serv_server_name', 'serv_auth_user_id', 'serv_port', 'serv_cookies', 'serv_os', 'serv_client', 'serv_device', 'serv_brand', 'serv_model', 'serv_bot', 'serv_host_by_ip'], 'default', 'value' => null],
         ];
     }
   

src/services/HitCounterService.php

Indentation +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 
             return $data;
         }else{
-           throw new BadRequestHttpException('required get param "i" cannot be empty.'); 
+            throw new BadRequestHttpException('required get param "i" cannot be empty.'); 
         }
 
     }   

Braces +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
             $data['js_processor_ram']   = ArrayHelper::getValue($array, 'ram');
 
             return $data;
-        }else{
+        } else{
            throw new BadRequestHttpException('required get param "i" cannot be empty.'); 
         }
 
@@ -125,7 +125,7 @@ 
 
         if ($request->cookies->has($name)){
             return $request->cookies->getValue($name);
-        }else{
+        } else{
             $str = Yii::$app->getSecurity()->generateRandomString();
             
             // add to HTTP

Spacing +9 added lines, -9 removed lines

@@ -20,14 +20,14 @@ 
 use yii\web\BadRequestHttpException;
 
 
-class HitCounterService extends Component{
+class HitCounterService extends Component {
 
     use RequestTrait;
 
     private $deviceDetector;
     private $repoHitCounter;
 
-    public function __construct(IDeviceDetect $dd, HitCounterRepository $hcr,  $config = [])
+    public function __construct(IDeviceDetect $dd, HitCounterRepository $hcr, $config = [])
     {
         $this->deviceDetector = $dd;
         $this->repoHitCounter = $hcr;
@@ -37,7 +37,7 @@ 
 
     public function create(HitCounterModel $model, string $entityClass = HitCounter::class): HitCounter
     {
-        $dto = (new HitCounterModelDtoAssembler())->writeDto($model);//dto
+        $dto = (new HitCounterModelDtoAssembler())->writeDto($model); //dto
         $hit = (new HitCounterDtoAssembler($entityClass))->readDto($dto);
 
         $this->repoHitCounter->save($hit);
@@ -57,7 +57,7 @@ 
         $array = $request->get();
         $data = [];
         
-        if(isset($array['i'])){
+        if (isset($array['i'])) {
             $data['counter_id']         = $array['i'];
             $data['js_cookei_enabled']  = ArrayHelper::getValue($array, 'c', 0);
             $data['js_java_enabled']    = ArrayHelper::getValue($array, 'j', 0);
@@ -69,13 +69,13 @@ 
             $data['js_screen_width']    = ArrayHelper::getValue($array, 'w');
             $data['js_screen_height']   = ArrayHelper::getValue($array, 'h');
             $data['js_color_depth']     = ArrayHelper::getValue($array, 'd');
-            $data['js_browser_language']= ArrayHelper::getValue($array, 'lg');
+            $data['js_browser_language'] = ArrayHelper::getValue($array, 'lg');
             $data['js_history_length']  = ArrayHelper::getValue($array, 'hl');
-            $data['js_is_toutch_device']= ArrayHelper::getValue($array, 'td', 0);
+            $data['js_is_toutch_device'] = ArrayHelper::getValue($array, 'td', 0);
             $data['js_processor_ram']   = ArrayHelper::getValue($array, 'ram');
 
             return $data;
-        }else{
+        }else {
            throw new BadRequestHttpException('required get param "i" cannot be empty.'); 
         }
 
@@ -122,9 +122,9 @@ 
 
         $name = static::defaultNameCookieMark();
 
-        if ($request->cookies->has($name)){
+        if ($request->cookies->has($name)) {
             return $request->cookies->getValue($name);
-        }else{
+        }else {
             $str = Yii::$app->getSecurity()->generateRandomString();
             
             // add to HTTP

src/services/HitCounterModelDtoAssembler.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  * Class HitCounterModelAssembler
  */
 
-final class HitCounterModelDtoAssembler{
+final class HitCounterModelDtoAssembler {
 
     /**
      * Return model with attributes loaded by dto

src/traits/RequestTrait.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 namespace coderius\hitCounter\traits;
 
-trait RequestTrait{
+trait RequestTrait {
 
     public function isProxyVisit() {
         if (@fsockopen($_SERVER['REMOTE_ADDR'], 80, $errstr, $errno, 1)) {

src/widgets/hitCounter/views/invisible-counter.php

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
 ?>
 
 <?php //Speed profiling ?>
-<?php if(YII_DEBUG): ?>
+<?php if (YII_DEBUG): ?>
 <script language="javascript" type="text/javascript">console.time('hitCounter-' + '<?= $counterId; ?>')</script>
 <?php endif; ?>
 
@@ -95,6 +95,6 @@ 
 //--></script>
 
 <?php //Speed profiling ?>
-<?php if(YII_DEBUG): ?>
+<?php if (YII_DEBUG): ?>
 <script language="javascript" type="text/javascript">console.timeEnd('hitCounter-' + '<?= $counterId; ?>');</script>
 <?php endif; ?>

src/widgets/hitCounter/HitCounterWidget.php

Braces +3 added lines, -1 removed lines

@@ -186,7 +186,9 @@
     {
         $defOpts = [];
         $defOpts['target'] = '_blank';
-        if($this->counterOptions['type'] === self::COUNTER_VIEW_INVISIBLE) $defOpts['style'] = 'position:absolute; left:-9999px;';
+        if($this->counterOptions['type'] === self::COUNTER_VIEW_INVISIBLE) {
+            $defOpts['style'] = 'position:absolute; left:-9999px;';
+        }
         $this->clientLinkOptions = array_merge($defOpts, $this->clientLinkOptions);
 
     }

Spacing +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
     {
         parent::init();
 
-        if(null === $this->counterId){
+        if (null === $this->counterId) {
             $this->counterId = $this->getId();
         }
 
@@ -191,7 +191,7 @@ 
     {
         $defOpts = [];
         $defOpts['target'] = '_blank';
-        if($this->counterOptions['type'] === self::COUNTER_VIEW_INVISIBLE) $defOpts['style'] = 'position:absolute; left:-9999px;';
+        if ($this->counterOptions['type'] === self::COUNTER_VIEW_INVISIBLE) $defOpts['style'] = 'position:absolute; left:-9999px;';
         $this->clientLinkOptions = array_merge($defOpts, $this->clientLinkOptions);
 
     }

src/config/Bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
         $this->addDependencies();
     }
 
-    private function addDependencies(){
+    private function addDependencies() {
         $container = \Yii::$container;
         
         $container->set(