dev-sonar / sonar-common

src/Imports/AbstractImport.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 namespace Sonar\Common\Imports;
 
 use Symfony\Component\Yaml\Yaml;
-use Symfony\Component\Yaml\Exception\ParseException;
 use File;
 
 abstract class AbstractImport

Spacing +20 added lines, -20 removed lines

@@ -10,34 +10,34 @@ 
     protected $config;
     private $filesystem;
 
-    public function __construct(Filesystem $filesystem=null)
+    public function __construct(Filesystem $filesystem = null)
     {
         $this->config = [];
         $this->filesystem = $filesystem ? $filesystem : new Filesystem;
     }
 
-    public function setConfig($config_file,$is_force=false)
+    public function setConfig($config_file, $is_force = false)
     {
         $config = Yaml::parse($config_file);
-        if ( is_array($config) === false || $is_force ) {
+        if (is_array($config) === false || $is_force) {
             $config = Yaml::parse($this->filesystem->get($config_file));
         }
-        if ( is_array($config) ) {
-            $this->config = array_merge($this->config,$config);
+        if (is_array($config)) {
+            $this->config = array_merge($this->config, $config);
         }
     }
     public function getConfig()
     {
         return $this->config;
     }
-    public function setModels($models,$csv)
+    public function setModels($models, $csv)
     {
-        foreach ( $models as $table => $model ) {
-            if ( is_array($model) ) {
+        foreach ($models as $table => $model) {
+            if (is_array($model)) {
                 $total = count($model);
-                for($i=0;$i<$total;$i++) {
-                    if ( isset($this->config[$table][$i]) ) {
-                        $this->setModel($model[$i],$this->config[$table][$i],$csv,$table);
+                for ($i = 0; $i < $total; $i++) {
+                    if (isset($this->config[$table][$i])) {
+                        $this->setModel($model[$i], $this->config[$table][$i], $csv, $table);
                     } else {
                         throw new \Exception('設定ファイルが正しくないか、構成が異なっています。table=' . $table);
                     }
@@ -47,23 +47,23 @@ 
         return true;
     }
 
-    public function setModel($model,$config,$csv,$table)
+    public function setModel($model, $config, $csv, $table)
     {
-        foreach ( $config as $key => $rec ) {
-            if ( isset($rec['func']) === true && $rec['func'] ) {
+        foreach ($config as $key => $rec) {
+            if (isset($rec['func']) === true && $rec['func']) {
                 $func = $rec['func'];
                 $col = isset($rec['csv']) ? $rec['csv'] : null;
-                if ( strpos($col,",") !== false ) {
-                    $col = explode(",",$col);
+                if (strpos($col, ",") !== false) {
+                    $col = explode(",", $col);
                 }
-                if ( method_exists($this,$func) === true ) {
-                    $this->$func($model,$key,$csv,$col);
+                if (method_exists($this, $func) === true) {
+                    $this->$func($model, $key, $csv, $col);
                 } else {
                     throw new \Exception(get_class($this) . 'に関数＝' . $func . 'が実装されていません。');
                 }
-            } elseif ( isset($rec['csv']) && is_numeric($rec['csv']) === true && isset($csv[($rec['csv']+0)-1]) ) {
+            } elseif (isset($rec['csv']) && is_numeric($rec['csv']) === true && isset($csv[($rec['csv']+0)-1])) {
                 $model->$key = $csv[($rec['csv']+0)-1];
-            } elseif ( isset($rec['csv']) && is_numeric($rec['csv']) === false && isset($csv[$rec['csv']]) ) {
+            } elseif (isset($rec['csv']) && is_numeric($rec['csv']) === false && isset($csv[$rec['csv']])) {
                 $model->$key = $csv[$rec['csv']];
             } else {
                 $model->$key = null;

src/Helpers/string.php

Spacing +3 added lines, -3 removed lines

@@ -1,13 +1,13 @@
 <?php

 

-if ( ! function_exists('strcat') ) {

+if ( ! function_exists('strcat')) {

     function strcat()

     {

         $args = func_get_args();

         $str = '';

 

-        foreach ( $args as $rec ) {

-            if ( $rec ) {

+        foreach ($args as $rec) {

+            if ($rec) {

                 $str .= $rec;

             } else {

                 return null;

src/Helpers/date.php

Spacing +9 added lines, -9 removed lines

@@ -1,29 +1,29 @@
 <?php

 use Carbon\Carbon;

 

-if ( ! function_exists('strtodate') ) {

-    function strtodate($date,$format='Y/m/d')

+if ( ! function_exists('strtodate')) {

+    function strtodate($date, $format = 'Y/m/d')

     {

-        if ( $date ) {

-            return date($format,strtotime($date));

+        if ($date) {

+            return date($format, strtotime($date));

         }

         return null;

     }

 }

 

-if ( ! function_exists('ym') ) {

+if ( ! function_exists('ym')) {

     function ym($ym)

     {

-        if ( $ym && $ym > 190001 ) {

-            return (floor($ym/100)) . '年' . ( floor($ym%100)) . '月';

+        if ($ym && $ym > 190001) {

+            return (floor($ym/100)) . '年' . (floor($ym%100)) . '月';

         }

         return null;

     }

 }

 

-if ( ! function_exists('elapse_days') ) {

+if ( ! function_exists('elapse_days')) {

     function elapse_days($timestamp)

     {

-        return Carbon::createFromTimeStamp($timestamp)->diffInDays(Carbon::now(),false);

+        return Carbon::createFromTimeStamp($timestamp)->diffInDays(Carbon::now(), false);

     }

 }

src/Helpers/format.php

Spacing +6 added lines, -6 removed lines

@@ -1,14 +1,14 @@
 <?php

 

-if ( ! function_exists('numeric_format') ) {

+if ( ! function_exists('numeric_format')) {

     function numeric_format($val) 

     {

-        $number = str_replace(",","",$val);

+        $number = str_replace(",", "", $val);

 

-        if ( is_numeric($number) ) {

-            $number = number_format($number,8);

-            $number = preg_replace('/\.0+$/','',$number);

-            $number = preg_replace('/(\.[0-9]*?)0+$/',"$1",$number);

+        if (is_numeric($number)) {

+            $number = number_format($number, 8);

+            $number = preg_replace('/\.0+$/', '', $number);

+            $number = preg_replace('/(\.[0-9]*?)0+$/', "$1", $number);

         }

         return $number;

     }

src/Imports/CsvReaderTrait.php

Spacing +3 added lines, -3 removed lines

@@ -5,11 +5,11 @@
 {
     abstract public function csvRecord(array $record);
 
-    public function csvRead($file,$delimiter=",",$envlosure='"',$escape="\\",$length=1024*1024)
+    public function csvRead($file, $delimiter = ",", $envlosure = '"', $escape = "\\", $length = 1024*1024)
     {
-        if ( ($fp = @fopen($file,"r")) !== false ) {
+        if (($fp = @fopen($file, "r")) !== false) {
 
-            while(($data = fgetcsv($fp,$length,$delimiter,$envlosure,$escape)) !== false ) {
+            while (($data = fgetcsv($fp, $length, $delimiter, $envlosure, $escape)) !== false) {
                 $this->csvRecord($data);
             }
             fclose($fp);

src/Imports/DummyImport.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
     {
 
     }
-    public function setName($model,$key,$csv,$col)
+    public function setName($model, $key, $csv, $col)
     {
 
     }

src/TreeStructureTrait.php

Spacing +16 added lines, -16 removed lines

@@ -18,27 +18,27 @@ 
     {

         $tree = isset($this->tree) ? $this->tree : [];

 

-        foreach ( $data as $rec ) {

-            if ( is_object($rec) === false ) throw new Exception('data record must be object.');

-            if ( isset($rec->id) === false ) throw new Exception('data record object does not have property => "id".');

-            if ( isset($rec->parent_id) === false || ! $rec->parent_id ) {

+        foreach ($data as $rec) {

+            if (is_object($rec) === false) throw new Exception('data record must be object.');

+            if (isset($rec->id) === false) throw new Exception('data record object does not have property => "id".');

+            if (isset($rec->parent_id) === false || ! $rec->parent_id) {

                 $rec->children = [];

                 $tree[$rec->id] = $rec;

             } else {

-                $this->addTree($tree,$rec);

+                $this->addTree($tree, $rec);

             }

         }

         $this->tree = $tree;

     }

-    protected function addTree(&$tree,$data)

+    protected function addTree(&$tree, $data)

     {

-        foreach ( $tree as $id => &$rec ) {

-            if ( $data->parent_id == $id ) {

+        foreach ($tree as $id => &$rec) {

+            if ($data->parent_id == $id) {

                 $data->children = [];

                 $rec->children[$data->id] = $data;

                 return;

-            } elseif ( count($rec->children) ) {

-                $this->addTree($rec->children,$data);

+            } elseif (count($rec->children)) {

+                $this->addTree($rec->children, $data);

             }

             unset($rec);

         }

@@ -46,12 +46,12 @@ 
     public function mergeCount($count_data)

     {

         $tree = isset($this->tree) ? $this->tree : [];

-        foreach ( $tree as &$rec ) {

-            foreach ( $count_data as $count ) {

-                if ( isset($rec->id) === false ) throw new Exception('data record object does not have property => "id".');

-                if ( isset($count->id) === false ) throw new Exception('count data record object does not have property => "id".');

-                if ( isset($count->count) === false ) throw new Exception('count data record object does not have property => "count".');

-                if ( $rec->id == $count->id ) {

+        foreach ($tree as &$rec) {

+            foreach ($count_data as $count) {

+                if (isset($rec->id) === false) throw new Exception('data record object does not have property => "id".');

+                if (isset($count->id) === false) throw new Exception('count data record object does not have property => "id".');

+                if (isset($count->count) === false) throw new Exception('count data record object does not have property => "count".');

+                if ($rec->id == $count->id) {

                     $rec->count = $count->count;

                 }

             }

Braces +15 added lines, -5 removed lines

@@ -19,8 +19,12 @@ 
         $tree = isset($this->tree) ? $this->tree : [];

 

         foreach ( $data as $rec ) {

-            if ( is_object($rec) === false ) throw new Exception('data record must be object.');

-            if ( isset($rec->id) === false ) throw new Exception('data record object does not have property => "id".');

+            if ( is_object($rec) === false ) {

+                throw new Exception('data record must be object.');

+            }

+            if ( isset($rec->id) === false ) {

+                throw new Exception('data record object does not have property => "id".');

+            }

             if ( isset($rec->parent_id) === false || ! $rec->parent_id ) {

                 $rec->children = [];

                 $tree[$rec->id] = $rec;

@@ -48,9 +52,15 @@ 
         $tree = isset($this->tree) ? $this->tree : [];

         foreach ( $tree as &$rec ) {

             foreach ( $count_data as $count ) {

-                if ( isset($rec->id) === false ) throw new Exception('data record object does not have property => "id".');

-                if ( isset($count->id) === false ) throw new Exception('count data record object does not have property => "id".');

-                if ( isset($count->count) === false ) throw new Exception('count data record object does not have property => "count".');

+                if ( isset($rec->id) === false ) {

+                    throw new Exception('data record object does not have property => "id".');

+                }

+                if ( isset($count->id) === false ) {

+                    throw new Exception('count data record object does not have property => "id".');

+                }

+                if ( isset($count->count) === false ) {

+                    throw new Exception('count data record object does not have property => "count".');

+                }

                 if ( $rec->id == $count->id ) {

                     $rec->count = $count->count;

                 }

src/HelpersServiceProvider.php

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
 {

     private $filesystem;

 

-    public function __construct($app,Filesystem $file=null)

+    public function __construct($app, Filesystem $file = null)

     {

         parent::__construct($app);

 

@@ -15,8 +15,8 @@ 
     }

     public function register()

     {

-        foreach ( $this->filesystem->allFiles(__DIR__ . '/Helpers') as $rec ) {

-            if ( preg_match("/\.php$/",$rec->getFilename()) ) {

+        foreach ($this->filesystem->allFiles(__DIR__ . '/Helpers') as $rec) {

+            if (preg_match("/\.php$/", $rec->getFilename())) {

                 require_once($rec->getPathname());

             }

         }