Packaged/Helpers 1.0

composer.json

@@ -10,7 +10,7 @@
   ],
   "require": {
     "php": ">=5.6.0",
-    "packaged/helpers": "*"
+    "packaged/helpers": "~1.0"
   },
   "require-dev": {
     "phpunit/phpunit": "4.1"

src/Assembler/Segments/AbstractSegmentAssembler.php

@@ -1,6 +1,7 @@
 <?php
 namespace Packaged\QueryBuilder\Assembler\Segments;
 
+use Packaged\Helpers\Objects;
 use Packaged\Helpers\Strings;
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\Statement\IStatementSegment;
@@ -74,7 +75,7 @@ public function assemble()
       "Unsupported segment '"
       . get_class($this->_segment)
       . "' passed to the " .
-      ucwords(Strings::humanize(class_shortname(get_called_class())))
+      ucwords(Strings::humanize(Objects::classShortname(get_called_class())))
     );
   }
 

src/Assembler/Segments/ClauseAssembler.php

@@ -1,6 +1,8 @@
 <?php
 namespace Packaged\QueryBuilder\Assembler\Segments;
 
+use Packaged\Helpers\Arrays;
+use Packaged\Helpers\Strings;
 use Packaged\QueryBuilder\Clause\AbstractFieldClause;
 use Packaged\QueryBuilder\Clause\AbstractPredicateClause;
 use Packaged\QueryBuilder\Clause\AbstractTableClause;
@@ -161,13 +163,15 @@ public function assemblePredicateClause(AbstractPredicateClause $clause)
     }
 
     if(count($clause->getPredicates()) === 1
-      && head($clause->getPredicates()) instanceof PredicateSet
+      && Arrays::first($clause->getPredicates()) instanceof PredicateSet
     )
     {
       $assembled = $this->getAssembler()->assembleSegment(
-        head($clause->getPredicates())
+        Arrays::first($clause->getPredicates())
       );
-      if(starts_with($assembled, '(') && ends_with($assembled, ')'))
+      if(Strings::startsWith($assembled, '(')
+        && Strings::endsWith($assembled, ')')
+      )
       {
         $assembled = substr($assembled, 1, -1);
       }

src/Builder/Traits/OrderByTrait.php

@@ -1,6 +1,7 @@
 <?php
 namespace Packaged\QueryBuilder\Builder\Traits;
 
+use Packaged\Helpers\Strings;
 use Packaged\QueryBuilder\Clause\OrderByClause;
 use Packaged\QueryBuilder\Statement\IStatement;
 
@@ -17,7 +18,7 @@ public function orderBy($fields)
     {
       foreach($fields as $field => $order)
       {
-        if(contains_any($order, ['asc', 'desc'], false))
+        if(Strings::containsAny($order, ['asc', 'desc'], false))
         {
           $orderClause->addField($field, $order);
         }

src/Builder/Traits/WhereTrait.php

@@ -1,6 +1,7 @@
 <?php
 namespace Packaged\QueryBuilder\Builder\Traits;
 
+use Packaged\Helpers\Arrays;
 use Packaged\QueryBuilder\Clause\WhereClause;
 use Packaged\QueryBuilder\Predicate\OrPredicateSet;
 use Packaged\QueryBuilder\Predicate\PredicateSet;
@@ -21,7 +22,7 @@ public function where(...$expressions)
   public function andWhere(...$expressions)
   {
     $currentSet = $this->_getCurrentSet();
-    $newSet     = $this->_getNewSet($expressions);
+    $newSet = $this->_getNewSet($expressions);
 
     $finalSet = new PredicateSet();
     $finalSet->addPredicate($currentSet);
@@ -41,7 +42,7 @@ public function andWhere(...$expressions)
   public function orWhere(...$expressions)
   {
     $currentSet = $this->_getCurrentSet();
-    $newSet     = $this->_getNewSet($expressions);
+    $newSet = $this->_getNewSet($expressions);
 
     $finalSet = new OrPredicateSet();
     $finalSet->addPredicate($currentSet);
@@ -74,7 +75,7 @@ private function _getCurrentSet()
 
     if(count($where->getPredicates()) === 1)
     {
-      $currentSet = head($where->getPredicates());
+      $currentSet = Arrays::first($where->getPredicates());
     }
     else
     {
@@ -90,7 +91,7 @@ private function _getNewSet(...$expressions)
     $newPredicates = WhereClause::buildPredicates($expressions);
     if(count($newPredicates) === 1)
     {
-      $newSet = head($newPredicates);
+      $newSet = Arrays::first($newPredicates);
     }
     else
     {

src/Clause/AbstractPredicateClause.php

@@ -1,6 +1,7 @@
 <?php
 namespace Packaged\QueryBuilder\Clause;
 
+use Packaged\Helpers\Arrays;
 use Packaged\QueryBuilder\Predicate\IPredicate;
 
 abstract class AbstractPredicateClause implements IClause
@@ -14,7 +15,7 @@ public function addPredicate(IPredicate $predicate)
 
   public function setPredicates(array $predicates)
   {
-    $this->_predicates = assert_instances_of(
+    $this->_predicates = Arrays::instancesOf(
       $predicates,
       '\Packaged\QueryBuilder\Predicate\IPredicate'
     );

src/Clause/InsertClause.php

@@ -1,6 +1,7 @@
 <?php
 namespace Packaged\QueryBuilder\Clause;
 
+use Packaged\Helpers\Arrays;
 use Packaged\QueryBuilder\Expression\FieldExpression;
 
 class InsertClause extends AbstractTableClause
@@ -15,7 +16,7 @@ public function addField(FieldExpression $field)
 
   public function setFields(array $fields)
   {
-    $this->_fields = assert_instances_of(
+    $this->_fields = Arrays::instancesOf(
       $fields,
       '\Packaged\QueryBuilder\Expression\FieldExpression'
     );

src/Clause/OrderByClause.php

@@ -1,6 +1,8 @@
 <?php
 namespace Packaged\QueryBuilder\Clause;
 
+use Packaged\Helpers\Arrays;
+
 class OrderByClause extends AbstractFieldClause
 {
   protected $_order;
@@ -27,6 +29,10 @@ public function clearFields()
 
   public function getOrder($field, $default = 'ASC')
   {
-    return idx($this->_order, array_search($field, $this->_fields), $default);
+    return Arrays::value(
+      $this->_order,
+      array_search($field, $this->_fields),
+      $default
+    );
   }
 }

src/Clause/SelectClause.php

@@ -1,6 +1,7 @@
 <?php
 namespace Packaged\QueryBuilder\Clause;
 
+use Packaged\Helpers\Arrays;
 use Packaged\QueryBuilder\SelectExpression\ConcatSelectExpression;
 use Packaged\QueryBuilder\SelectExpression\FieldSelectExpression;
 use Packaged\QueryBuilder\SelectExpression\ISelectExpression;
@@ -29,7 +30,7 @@ public function addExpression(ISelectExpression $expression)
 
   public function setExpressions(array $expressions)
   {
-    $this->_expressions = assert_instances_of(
+    $this->_expressions = Arrays::instancesOf(
       $expressions,
       '\Packaged\QueryBuilder\SelectExpression\ISelectExpression'
     );

src/Clause/ValuesClause.php

@@ -1,6 +1,7 @@
 <?php
 namespace Packaged\QueryBuilder\Clause;
 
+use Packaged\Helpers\Arrays;
 use Packaged\QueryBuilder\Expression\IExpression;
 
 class ValuesClause implements IClause
@@ -15,7 +16,7 @@ public function addExpression(IExpression $expression)
 
   public function setExpressions(array $expressions)
   {
-    $this->_expressions = assert_instances_of(
+    $this->_expressions = Arrays::instancesOf(
       $expressions,
       '\Packaged\QueryBuilder\Expression\IExpression'
     );

src/Predicate/PredicateSet.php

@@ -1,6 +1,8 @@
 <?php
 namespace Packaged\QueryBuilder\Predicate;
 
+use Packaged\Helpers\Arrays;
+
 class PredicateSet implements IPredicate
 {
   protected $_predicates = [];
@@ -12,7 +14,7 @@ public function addPredicate(IPredicate $predicate)
 
   public function setPredicates(array $predicates)
   {
-    $this->_predicates = assert_instances_of(
+    $this->_predicates = Arrays::instancesOf(
       $predicates,
       '\Packaged\QueryBuilder\Predicate\IPredicate'
     );

src/SelectExpression/ConcatSelectExpression.php

@@ -1,12 +1,13 @@
 <?php
 namespace Packaged\QueryBuilder\SelectExpression;
 
+use Packaged\Helpers\Strings;
 use Packaged\QueryBuilder\Expression\FieldExpression;
 use Packaged\QueryBuilder\SelectExpression\Traits\AliasTrait;
 
 /**
- * Fields to concat together should be specified individually into the contructor
- * and strings should be quoted before pushing through
+ * Fields to concat together should be specified individually into the
+ * contructor and strings should be quoted before pushing through
  */
 class ConcatSelectExpression implements ISelectExpression
 {
@@ -24,7 +25,7 @@ public function setPropertyArray($properties)
     $this->_properties = [];
     foreach($properties as $property)
     {
-      if(contains_any($property, ['"', "'", ')']))
+      if(Strings::containsAny($property, ['"', "'", ')']))
       {
         $this->_properties[] = $property;
       }

tests/Builder/Traits/GroupByTraitTest.php

@@ -1,6 +1,7 @@
 <?php
 namespace Packaged\Tests\QueryBuilder\Builder\Traits;
 
+use Packaged\Helpers\Arrays;
 use Packaged\QueryBuilder\Builder\Traits\GroupByTrait;
 use Packaged\QueryBuilder\Clause\GroupByClause;
 use Packaged\QueryBuilder\Statement\AbstractStatement;
@@ -40,7 +41,7 @@ public function testCreate()
 
   protected function _verifyClause(GroupByClause $clause, $fields)
   {
-    $fields = array_fuse($fields);
+    $fields = Arrays::fuse($fields);
     foreach($clause->getFields() as $field)
     {
       unset($fields[$field->getField()]);