Merge pull request #10 from pedro-teixeira/feature/add-travis-badges

Add travis and badges
pedro-teixeira · Oct 7, 2014 · f80694e · f80694e
2 parents 95889d3 + 1534ce3
commit f80694e
Show file tree

Hide file tree

Showing 35 changed files with 179 additions and 145 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,10 @@
-vendor
-composer.lock
+/vendor/
+/bin/
+/composer.lock
 
-# IDE Files #
-#############
 .idea
 nbproject
 
-# OS generated files #
-######################
 .DS_Store
 .DS_Store?
 ._*

diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,16 @@
+language: php
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+before_script:
+  - composer self-update
+  - composer install
+
+script:
+  - find ./Grid ./DependencyInjection ./Twig -name "*.php" -exec php -l {} \;
+  - ./bin/phpcs --extensions=php --standard=PSR2 ./Grid ./DependencyInjection ./Twig
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -8,7 +8,7 @@
 /**
  * This is the class that validates and merges configuration from your app/config files
  *
- * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
+ * @link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class
  */
 class Configuration implements ConfigurationInterface
 {

diff --git a/Grid/Column.php b/Grid/Column.php
@@ -330,4 +330,4 @@ public function getRender()
             );
         }
     }
-}
+}
diff --git a/Grid/Factory.php b/Grid/Factory.php
@@ -37,4 +37,4 @@ public function createGrid($gridClassName)
 
         return $grid;
     }
-}
+}
diff --git a/Grid/Filter/Date.php b/Grid/Filter/Date.php
@@ -34,10 +34,15 @@ public function __construct(\Symfony\Component\DependencyInjection\Container $co
     public function render()
     {
         if ($this->getUseDatePicker()) {
-            $html  = '<input ' . $this->getNameAndId() . ' type="text" value="' . $this->getValue() . '" placeholder="' . $this->getPlaceholder() . '" data-date-format="' . strtolower($this->dateFormat) . '">';
-            $html .= '<script type="text/javascript">$(document).ready(function () {$("#' . $this->getId() . '").datepicker()})</script>';
+            $html  = '<input ' . $this->getNameAndId() . ' type="text" value="' . $this->getValue() .
+                '" placeholder="' . $this->getPlaceholder() .
+                '" data-date-format="' . strtolower($this->dateFormat) . '">';
+
+            $html .= '<script type="text/javascript">' .
+                '$(document).ready(function () {$("#' . $this->getId() . '").datepicker()})</script>';
         } else {
-            $html = '<input ' . $this->getNameAndId() . ' type="date" value="' . $this->getValue() . '" placeholder="' . $this->getPlaceholder() . '">';
+            $html = '<input ' . $this->getNameAndId() . ' type="date" value="' . $this->getValue() .
+                '" placeholder="' . $this->getPlaceholder() . '">';
         }
 
         return $html;
@@ -50,4 +55,4 @@ public function getUseDatePicker()
     {
         return $this->container->getParameter('pedro_teixeira_grid.date.use_datepicker');
     }
-}
+}
diff --git a/Grid/Filter/DateRange.php b/Grid/Filter/DateRange.php
@@ -23,18 +23,28 @@ class DateRange extends Date
     public function render()
     {
         if ($this->getUseDatePicker()) {
+            $html  = '<input class="date-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() .
+                'from" type="text" value="' . $this->getValue() .
+                '" placeholder="' . $this->getPlaceholder() .
+                '" data-date-format="' . strtolower($this->dateFormat) . '">';
 
-            $html  = '<input class="date-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() . 'from" type="text" value="' . $this->getValue() . '" placeholder="' . $this->getPlaceholder() . '" data-date-format="' . strtolower($this->dateFormat) . '">';
             $html .= $this->getInputSeparator();
-            $html .= '<input class="date-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() . 'to" type="text" value="' . $this->getValue() . '" placeholder="' . $this->getPlaceholder() . '" data-date-format="' . strtolower($this->dateFormat) . '">';
-            $html .= '<script type="text/javascript">$(document).ready(function () {$("#' . $this->getId() . 'from").datepicker(); $("#' . $this->getId() . 'to").datepicker()})</script>';
 
+            $html .= '<input class="date-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() .
+                'to" type="text" value="' . $this->getValue() .
+                '" placeholder="' . $this->getPlaceholder() .
+                '" data-date-format="' . strtolower($this->dateFormat) . '">';
+
+            $html .= '<script type="text/javascript">$(document).ready(function () {$("#' .
+                $this->getId() . 'from").datepicker(); $("#' . $this->getId() . 'to").datepicker()})</script>';
         } else {
+            $html  = '<input class="date-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() .
+                'from" type="date" placeholder="' . $this->getPlaceholder() . '" value="' . $this->getValue() . '"> ';
 
-            $html  = '<input class="date-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() . 'from" type="date" placeholder="' . $this->getPlaceholder() . '" value="' . $this->getValue() . '"> ';
             $html .= $this->getInputSeparator();
-            $html .= '<input class="date-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() . 'to" type="date" placeholder="' . $this->getPlaceholder() . '" value="' . $this->getValue() . '">';
 
+            $html .= '<input class="date-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() .
+                'to" type="date" placeholder="' . $this->getPlaceholder() . '" value="' . $this->getValue() . '">';
         }
 
         return $html;
@@ -59,4 +69,4 @@ public function getInputSeparator()
     {
         return $this->inputSeparator;
     }
-}
+}
diff --git a/Grid/Filter/FilterAbstract.php b/Grid/Filter/FilterAbstract.php
@@ -229,4 +229,4 @@ public function execute(\Doctrine\ORM\QueryBuilder $queryBuilder, $value)
             ->setQueryBuilder($queryBuilder)
             ->execute($value);
     }
-}
+}
diff --git a/Grid/Filter/NumberRange.php b/Grid/Filter/NumberRange.php
@@ -22,9 +22,13 @@ class NumberRange extends FilterAbstract
      */
     public function render()
     {
-        $html  = '<input class="number-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() . 'from" type="text" placeholder="' . $this->getPlaceholder() . '" value="' . $this->getValue() . '"> ';
+        $html  = '<input class="number-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() .
+            'from" type="text" placeholder="' . $this->getPlaceholder() . '" value="' . $this->getValue() . '"> ';
+
         $html .= $this->getInputSeparator();
-        $html .= '<input class="number-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() . 'to" type="text" placeholder="' . $this->getPlaceholder() . '" value="' . $this->getValue() . '">';
+
+        $html .= '<input class="number-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() .
+            'to" type="text" placeholder="' . $this->getPlaceholder() . '" value="' . $this->getValue() . '">';
 
         return $html;
     }
@@ -48,4 +52,4 @@ public function getInputSeparator()
     {
         return $this->inputSeparator;
     }
-}
+}
diff --git a/Grid/Filter/Operator/Comparison.php b/Grid/Filter/Operator/Comparison.php
@@ -169,4 +169,4 @@ public function getComparisonType()
     {
         return $this->comparisonType;
     }
-}
+}
diff --git a/Grid/Filter/Operator/Date.php b/Grid/Filter/Operator/Date.php
@@ -33,4 +33,4 @@ public function execute($value)
 
         $queryBuilder->setParameter($this->getIndexClean(), $date->format('Y-m-d') . '%');
     }
-}
+}
diff --git a/Grid/Filter/Operator/DateRange.php b/Grid/Filter/Operator/DateRange.php
@@ -35,7 +35,8 @@ public function execute($value)
                 $queryBuilder->expr()->gte(
                     $this->getIndex(),
                     ":{$this->getIndexClean()}_1"
-                ))
+                )
+            )
                 ->setParameter(
                     ":{$this->getIndexClean()}_1",
                     $date->format('Y-m-d') . ' 00:00:00'
@@ -55,11 +56,12 @@ public function execute($value)
                 $queryBuilder->expr()->lte(
                     $this->getIndex(),
                     ":{$this->getIndexClean()}_2"
-                ))
+                )
+            )
                 ->setParameter(
                     ":{$this->getIndexClean()}_2",
                     $date->format('Y-m-d') . ' 23:59:59'
                 );
         }
     }
-}
+}
diff --git a/Grid/Filter/Operator/Having.php b/Grid/Filter/Operator/Having.php
@@ -19,4 +19,4 @@ public function execute($value)
         $queryBuilder->having($this->getIndex() . " = :{$this->getIndexClean()}")
             ->setParameter($this->getIndexClean(), $value);
     }
-}
+}
diff --git a/Grid/Filter/Operator/HavingNumberRange.php b/Grid/Filter/Operator/HavingNumberRange.php
@@ -46,4 +46,4 @@ public function execute($value)
                 );
         }
     }
-}
+}
diff --git a/Grid/Filter/Operator/NumberRange.php b/Grid/Filter/Operator/NumberRange.php
@@ -25,7 +25,8 @@ public function execute($value)
                 $queryBuilder->expr()->gte(
                     $this->getIndex(),
                     ":{$this->getIndexClean()}_1"
-                ))
+                )
+            )
                 ->setParameter(
                     ":{$this->getIndexClean()}_1",
                     (float) $value[0]
@@ -38,11 +39,12 @@ public function execute($value)
                 $queryBuilder->expr()->lte(
                     $this->getIndex(),
                     ":{$this->getIndexClean()}_2"
-                ))
+                )
+            )
                 ->setParameter(
                     ":{$this->getIndexClean()}_2",
                     (float) $value[1]
                 );
         }
     }
-}
+}
diff --git a/Grid/Filter/Operator/OperatorAbstract.php b/Grid/Filter/Operator/OperatorAbstract.php
@@ -130,4 +130,4 @@ public function getWhere()
     {
         return $this->where;
     }
-}
+}
diff --git a/Grid/Filter/Select.php b/Grid/Filter/Select.php
@@ -103,4 +103,4 @@ public function getOptions()
     {
         return $this->options;
     }
-}
+}
diff --git a/Grid/Filter/Text.php b/Grid/Filter/Text.php
@@ -17,7 +17,8 @@ class Text extends FilterAbstract
      */
     public function render()
     {
-        $html = '<input ' . $this->getNameAndId() . ' type="' . $this->getInputType() . '" value="' . $this->getValue() . '" placeholder="' . $this->getPlaceholder() . '">';
+        $html = '<input ' . $this->getNameAndId() . ' type="' . $this->getInputType() .
+            '" value="' . $this->getValue() . '" placeholder="' . $this->getPlaceholder() . '">';
 
         return $html;
     }
@@ -41,4 +42,4 @@ public function getInputType()
     {
         return $this->inputType;
     }
-}
+}
diff --git a/Grid/Filter/YesNo.php b/Grid/Filter/YesNo.php
@@ -14,4 +14,4 @@ class YesNo extends Select
         '0' => 'No',
         '1' => 'Yes'
     );
-}
+}
diff --git a/Grid/GridAbstract.php b/Grid/GridAbstract.php
@@ -370,24 +370,24 @@ public function getData()
                     $rowColumn = $row[$column->getField()];
 
                 // Array scalar
-                } else if (array_key_exists(0, $row) && array_key_exists($column->getField(), $row[0])) {
+                } elseif (array_key_exists(0, $row) && array_key_exists($column->getField(), $row[0])) {
 
                     $rowColumn = $row[0][$column->getField()];
 
                 // Object
-                } else if (method_exists($row, 'get' . ucfirst($column->getField()))) {
+                } elseif (method_exists($row, 'get' . ucfirst($column->getField()))) {
 
                     $method = 'get' . ucfirst($column->getField());
                     $rowColumn = $row->$method();
 
                 // Object scalar
-                } else if (array_key_exists(0, $row) && method_exists($row[0], 'get' . ucfirst($column->getField()))) {
+                } elseif (array_key_exists(0, $row) && method_exists($row[0], 'get' . ucfirst($column->getField()))) {
 
                     $method = 'get' . ucfirst($column->getField());
                     $rowColumn = $row[0]->$method();
 
                 // Array
-                } else if ($column->getTwig()) {
+                } elseif ($column->getTwig()) {
 
                     $rowColumn = $this->templating->render(
                         $column->getTwig(),
@@ -508,4 +508,4 @@ public function render()
             }
         }
     }
-}
+}
diff --git a/Grid/GridView.php b/Grid/GridView.php
@@ -44,4 +44,4 @@ public function getPaginationLimit()
     {
         return $this->container->getParameter('pedro_teixeira_grid.pagination.limit');
     }
-}
+}
diff --git a/Grid/Render/Currency.php b/Grid/Render/Currency.php
@@ -14,8 +14,14 @@ class Currency extends RenderAbstract
      */
     public function render()
     {
-        $formatter = new StubNumberFormatter($this->container->getParameter('pedro_teixeira_grid.currency.locale'), StubNumberFormatter::CURRENCY);
-        return $formatter->formatCurrency($this->getValue(), $this->container->getParameter('pedro_teixeira_grid.currency.currency'));
+        $formatter = new StubNumberFormatter(
+            $this->container->getParameter('pedro_teixeira_grid.currency.locale'),
+            StubNumberFormatter::CURRENCY
+        );
+
+        return $formatter->formatCurrency(
+            $this->getValue(),
+            $this->container->getParameter('pedro_teixeira_grid.currency.currency')
+        );
     }
 }
-
diff --git a/Grid/Render/Date.php b/Grid/Render/Date.php
@@ -24,4 +24,4 @@ public function render()
             return $transformer->format($this->getValue());
         }
     }
-}
+}
diff --git a/Grid/Render/DateTime.php b/Grid/Render/DateTime.php
@@ -24,4 +24,4 @@ public function render()
             return $transformer->format($this->getValue());
         }
     }
-}
+}
diff --git a/Grid/Render/RenderAbstract.php b/Grid/Render/RenderAbstract.php
@@ -76,4 +76,4 @@ public function getStringOnly()
     {
         return $this->stringOnly;
     }
-}
+}
diff --git a/Grid/Render/Text.php b/Grid/Render/Text.php
@@ -14,4 +14,4 @@ public function render()
     {
         return $this->getValue();
     }
-}
+}
diff --git a/Grid/Render/Url.php b/Grid/Render/Url.php
@@ -18,4 +18,4 @@ public function render()
             return '<a href="' . $this->getValue() . '" target="_blank">' . $this->getValue() . '</a>';
         }
     }
-}
+}
diff --git a/Grid/Render/YesNo.php b/Grid/Render/YesNo.php
@@ -27,7 +27,7 @@ public function render()
         } else {
             if ($this->getValue() && $this->getShowYes()) {
                 return '<i class="glyphicon glyphicon-ok"></i>';
-            } else if ($this->getShowNo()) {
+            } elseif ($this->getShowNo()) {
                 return '<i class="glyphicon glyphicon-remove"></i>';
             }
         }
@@ -74,4 +74,4 @@ public function getShowYes()
     {
         return $this->showYes;
     }
-}
+}