mirror/php-flextype
1
0
Fork 0
mirror of https://github.com/flextype/flextype.git synced 2025-08-12 08:04:05 +02:00
Code Issues Releases Wiki Activity

feat(element-queries): add protected function isAssocArray and update all() method #436

Browse Source
This commit is contained in:
Awilum
2020-07-15 21:05:58 +03:00
parent 02501797c0
commit 0770e12986
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/flextype/Support/Collection.php
View File

@@ -110,7 +110,7 @@ class Collection
// Check if array is associative
// Flatten a multi-dimensional array with dots.
if (count(array_filter(array_keys($items), 'is_string'))) {
if ($this->isAssocArray($items)) {
$flat_array = [];
foreach ($items as $key => $value) {
@@ -392,20 +392,6 @@ class Collection
* @access public
*/
public function all() : array
{
$results = $this->matchCollection()->toArray();
return Arr::isAssoc($results) ?
array_undot(array_dot($results)) :
$results;
}
/**
* Match collection
*
* @access protected
*/
public function matchCollection()
{
// Match collection
$collection = $this->collection->matching($this->criteria);
@@ -413,7 +399,24 @@ class Collection
// Restore error_reporting
error_reporting($this->oldErrorReporting);
// Return collection
return $collection;
// Gets a native PHP array representation of the collection.
$results = $collection->toArray();
// Return results
return $this->isAssocArray($results) ? array_undot(array_dot($results)) : $results;
}
/**
* Returns TRUE if the array is associative and FALSE if not.
*
* @param array $array Array to check
*
* @return bool
*
* @access public
*/
protected function isAssocArray(array $array) : bool
{
return (bool) count(array_filter(array_keys($array), 'is_string'));
}
}