mirror of
https://github.com/wiosna-dev/common-library.git
synced 2026-03-12 09:31:51 +01:00
Collection > trait > split into smaller traits (to make it more flexible)
This commit is contained in:
@@ -6,6 +6,7 @@ Common and useful classes, methods, exceptions etc.
|
|||||||
|
|
||||||
1. PHP Coding Standards Fixer > update configuration
|
1. PHP Coding Standards Fixer > update configuration
|
||||||
2. Phing > tests > add task for Psalm (https://psalm.dev)
|
2. Phing > tests > add task for Psalm (https://psalm.dev)
|
||||||
|
3. Collection > trait > split into smaller traits (to make it more flexible)
|
||||||
|
|
||||||
# 1.0.3
|
# 1.0.3
|
||||||
|
|
||||||
|
|||||||
63
src/Traits/Collection/AddTrait.php
Normal file
63
src/Traits/Collection/AddTrait.php
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* (c) Meritoo.pl, http://www.meritoo.pl
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Meritoo\Common\Traits\Collection;
|
||||||
|
|
||||||
|
use Meritoo\Common\Collection\Collection;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Trait for the Collection with add*() methods
|
||||||
|
*
|
||||||
|
* @author Meritoo <github@meritoo.pl>
|
||||||
|
* @copyright Meritoo <http://www.meritoo.pl>
|
||||||
|
*/
|
||||||
|
trait AddTrait
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Adds given element (at the end of collection)
|
||||||
|
*
|
||||||
|
* @param mixed $element The element to add
|
||||||
|
* @param mixed $index (optional) Index / key of the element
|
||||||
|
* @return $this
|
||||||
|
*/
|
||||||
|
public function add($element, $index = null): self
|
||||||
|
{
|
||||||
|
if (null === $index || '' === $index) {
|
||||||
|
$this->elements[] = $element;
|
||||||
|
} else {
|
||||||
|
$this->elements[$index] = $element;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds given elements (at the end of collection)
|
||||||
|
*
|
||||||
|
* @param array|Collection $elements The elements to add
|
||||||
|
* @param bool|false $useIndexes (optional) If is set to true, indexes of given elements will be used in
|
||||||
|
* this collection. Otherwise - not.
|
||||||
|
* @return $this
|
||||||
|
*/
|
||||||
|
public function addMultiple($elements, bool $useIndexes = false): self
|
||||||
|
{
|
||||||
|
if (!empty($elements)) {
|
||||||
|
foreach ($elements as $index => $element) {
|
||||||
|
if ($useIndexes) {
|
||||||
|
$this->add($element, $index);
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->add($element);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
}
|
||||||
73
src/Traits/Collection/GetTrait.php
Normal file
73
src/Traits/Collection/GetTrait.php
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* (c) Meritoo.pl, http://www.meritoo.pl
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Meritoo\Common\Traits\Collection;
|
||||||
|
|
||||||
|
use Meritoo\Common\Utilities\Arrays;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Trait for the Collection with getters
|
||||||
|
*
|
||||||
|
* @author Meritoo <github@meritoo.pl>
|
||||||
|
* @copyright Meritoo <http://www.meritoo.pl>
|
||||||
|
*/
|
||||||
|
trait GetTrait
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Returns previous element for given element
|
||||||
|
*
|
||||||
|
* @param mixed $element The element to verify
|
||||||
|
* @return null|mixed
|
||||||
|
*/
|
||||||
|
public function getPrevious($element)
|
||||||
|
{
|
||||||
|
return Arrays::getPreviousElement($this->elements, $element);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns next element for given element
|
||||||
|
*
|
||||||
|
* @param mixed $element The element to verify
|
||||||
|
* @return null|mixed
|
||||||
|
*/
|
||||||
|
public function getNext($element)
|
||||||
|
{
|
||||||
|
return Arrays::getNextElement($this->elements, $element);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the first element in the collection
|
||||||
|
*
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
public function getFirst()
|
||||||
|
{
|
||||||
|
return Arrays::getFirstElement($this->elements);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the last element in the collection
|
||||||
|
*
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
public function getLast()
|
||||||
|
{
|
||||||
|
return Arrays::getLastElement($this->elements);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns element with given index
|
||||||
|
*
|
||||||
|
* @param mixed $index Index / key of the element
|
||||||
|
* @return null|mixed
|
||||||
|
*/
|
||||||
|
public function getByIndex($index)
|
||||||
|
{
|
||||||
|
return $this->elements[$index] ?? null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,9 +8,6 @@
|
|||||||
|
|
||||||
namespace Meritoo\Common\Traits\Collection;
|
namespace Meritoo\Common\Traits\Collection;
|
||||||
|
|
||||||
use Meritoo\Common\Collection\Collection;
|
|
||||||
use Meritoo\Common\Utilities\Arrays;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Main trait for the Collection
|
* Main trait for the Collection
|
||||||
*
|
*
|
||||||
@@ -26,185 +23,6 @@ trait MainTrait
|
|||||||
*/
|
*/
|
||||||
private $elements;
|
private $elements;
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds given element (at the end of collection)
|
|
||||||
*
|
|
||||||
* @param mixed $element The element to add
|
|
||||||
* @param mixed $index (optional) Index / key of the element
|
|
||||||
* @return $this
|
|
||||||
*/
|
|
||||||
public function add($element, $index = null): self
|
|
||||||
{
|
|
||||||
if (null === $index || '' === $index) {
|
|
||||||
$this->elements[] = $element;
|
|
||||||
} else {
|
|
||||||
$this->elements[$index] = $element;
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds given elements (at the end of collection)
|
|
||||||
*
|
|
||||||
* @param array|Collection $elements The elements to add
|
|
||||||
* @param bool|false $useIndexes (optional) If is set to true, indexes of given elements will be used in
|
|
||||||
* this collection. Otherwise - not.
|
|
||||||
* @return $this
|
|
||||||
*/
|
|
||||||
public function addMultiple($elements, bool $useIndexes = false): self
|
|
||||||
{
|
|
||||||
if (!empty($elements)) {
|
|
||||||
foreach ($elements as $index => $element) {
|
|
||||||
if ($useIndexes) {
|
|
||||||
$this->add($element, $index);
|
|
||||||
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->add($element);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Prepends given element (adds given element at the beginning of collection)
|
|
||||||
*
|
|
||||||
* @param mixed $element The element to prepend
|
|
||||||
* @return $this
|
|
||||||
*/
|
|
||||||
public function prepend($element): self
|
|
||||||
{
|
|
||||||
array_unshift($this->elements, $element);
|
|
||||||
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes given element
|
|
||||||
*
|
|
||||||
* @param mixed $element The element to remove
|
|
||||||
* @return $this
|
|
||||||
*/
|
|
||||||
public function remove($element): self
|
|
||||||
{
|
|
||||||
if ($this->count() > 0) {
|
|
||||||
foreach ($this->elements as $index => $existing) {
|
|
||||||
if ($element === $existing) {
|
|
||||||
unset($this->elements[$index]);
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns information if collection is empty
|
|
||||||
*
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public function isEmpty(): bool
|
|
||||||
{
|
|
||||||
return empty($this->elements);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns information if given element is first in the collection
|
|
||||||
*
|
|
||||||
* @param mixed $element The element to verify
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public function isFirst($element): bool
|
|
||||||
{
|
|
||||||
return reset($this->elements) === $element;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns information if given element is last in the collection
|
|
||||||
*
|
|
||||||
* @param mixed $element The element to verify
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public function isLast($element): bool
|
|
||||||
{
|
|
||||||
return end($this->elements) === $element;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns information if the collection has given element, iow. if given element exists in the collection
|
|
||||||
*
|
|
||||||
* @param mixed $element The element to verify
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public function has($element): bool
|
|
||||||
{
|
|
||||||
$index = Arrays::getIndexOf($this->elements, $element);
|
|
||||||
|
|
||||||
return null !== $index && false !== $index;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns previous element for given element
|
|
||||||
*
|
|
||||||
* @param mixed $element The element to verify
|
|
||||||
* @return null|mixed
|
|
||||||
*/
|
|
||||||
public function getPrevious($element)
|
|
||||||
{
|
|
||||||
return Arrays::getPreviousElement($this->elements, $element);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns next element for given element
|
|
||||||
*
|
|
||||||
* @param mixed $element The element to verify
|
|
||||||
* @return null|mixed
|
|
||||||
*/
|
|
||||||
public function getNext($element)
|
|
||||||
{
|
|
||||||
return Arrays::getNextElement($this->elements, $element);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the first element in the collection
|
|
||||||
*
|
|
||||||
* @return mixed
|
|
||||||
*/
|
|
||||||
public function getFirst()
|
|
||||||
{
|
|
||||||
return Arrays::getFirstElement($this->elements);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the last element in the collection
|
|
||||||
*
|
|
||||||
* @return mixed
|
|
||||||
*/
|
|
||||||
public function getLast()
|
|
||||||
{
|
|
||||||
return Arrays::getLastElement($this->elements);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns element with given index
|
|
||||||
*
|
|
||||||
* @param mixed $index Index / key of the element
|
|
||||||
* @return null|mixed
|
|
||||||
*/
|
|
||||||
public function getByIndex($index)
|
|
||||||
{
|
|
||||||
if (isset($this->elements[$index])) {
|
|
||||||
return $this->elements[$index];
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns representation of object as array
|
* Returns representation of object as array
|
||||||
*
|
*
|
||||||
|
|||||||
52
src/Traits/Collection/ModifyTrait.php
Normal file
52
src/Traits/Collection/ModifyTrait.php
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* (c) Meritoo.pl, http://www.meritoo.pl
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Meritoo\Common\Traits\Collection;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Trait for the Collection with methods that modify collection
|
||||||
|
*
|
||||||
|
* @author Meritoo <github@meritoo.pl>
|
||||||
|
* @copyright Meritoo <http://www.meritoo.pl>
|
||||||
|
*/
|
||||||
|
trait ModifyTrait
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Prepends given element (adds given element at the beginning of collection)
|
||||||
|
*
|
||||||
|
* @param mixed $element The element to prepend
|
||||||
|
* @return $this
|
||||||
|
*/
|
||||||
|
public function prepend($element): self
|
||||||
|
{
|
||||||
|
array_unshift($this->elements, $element);
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Removes given element
|
||||||
|
*
|
||||||
|
* @param mixed $element The element to remove
|
||||||
|
* @return $this
|
||||||
|
*/
|
||||||
|
public function remove($element): self
|
||||||
|
{
|
||||||
|
if ($this->count() > 0) {
|
||||||
|
foreach ($this->elements as $index => $existing) {
|
||||||
|
if ($element === $existing) {
|
||||||
|
unset($this->elements[$index]);
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
}
|
||||||
65
src/Traits/Collection/VerifyTrait.php
Normal file
65
src/Traits/Collection/VerifyTrait.php
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* (c) Meritoo.pl, http://www.meritoo.pl
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Meritoo\Common\Traits\Collection;
|
||||||
|
|
||||||
|
use Meritoo\Common\Utilities\Arrays;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Trait for the Collection with methods that verify collection
|
||||||
|
*
|
||||||
|
* @author Meritoo <github@meritoo.pl>
|
||||||
|
* @copyright Meritoo <http://www.meritoo.pl>
|
||||||
|
*/
|
||||||
|
trait VerifyTrait
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Returns information if collection is empty
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function isEmpty(): bool
|
||||||
|
{
|
||||||
|
return empty($this->elements);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns information if given element is first in the collection
|
||||||
|
*
|
||||||
|
* @param mixed $element The element to verify
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function isFirst($element): bool
|
||||||
|
{
|
||||||
|
return reset($this->elements) === $element;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns information if given element is last in the collection
|
||||||
|
*
|
||||||
|
* @param mixed $element The element to verify
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function isLast($element): bool
|
||||||
|
{
|
||||||
|
return end($this->elements) === $element;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns information if the collection has given element, iow. if given element exists in the collection
|
||||||
|
*
|
||||||
|
* @param mixed $element The element to verify
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function has($element): bool
|
||||||
|
{
|
||||||
|
$index = Arrays::getIndexOf($this->elements, $element);
|
||||||
|
|
||||||
|
return null !== $index && false !== $index;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,10 +8,14 @@
|
|||||||
|
|
||||||
namespace Meritoo\Common\Traits;
|
namespace Meritoo\Common\Traits;
|
||||||
|
|
||||||
|
use Meritoo\Common\Traits\Collection\AddTrait;
|
||||||
use Meritoo\Common\Traits\Collection\ArrayAccessTrait;
|
use Meritoo\Common\Traits\Collection\ArrayAccessTrait;
|
||||||
use Meritoo\Common\Traits\Collection\CountableTrait;
|
use Meritoo\Common\Traits\Collection\CountableTrait;
|
||||||
|
use Meritoo\Common\Traits\Collection\GetTrait;
|
||||||
use Meritoo\Common\Traits\Collection\IteratorAggregateTrait;
|
use Meritoo\Common\Traits\Collection\IteratorAggregateTrait;
|
||||||
use Meritoo\Common\Traits\Collection\MainTrait;
|
use Meritoo\Common\Traits\Collection\MainTrait;
|
||||||
|
use Meritoo\Common\Traits\Collection\ModifyTrait;
|
||||||
|
use Meritoo\Common\Traits\Collection\VerifyTrait;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Trait for the Collection
|
* Trait for the Collection
|
||||||
@@ -22,6 +26,10 @@ use Meritoo\Common\Traits\Collection\MainTrait;
|
|||||||
trait CollectionTrait
|
trait CollectionTrait
|
||||||
{
|
{
|
||||||
use MainTrait;
|
use MainTrait;
|
||||||
|
use AddTrait;
|
||||||
|
use ModifyTrait;
|
||||||
|
use GetTrait;
|
||||||
|
use VerifyTrait;
|
||||||
use CountableTrait;
|
use CountableTrait;
|
||||||
use ArrayAccessTrait;
|
use ArrayAccessTrait;
|
||||||
use IteratorAggregateTrait;
|
use IteratorAggregateTrait;
|
||||||
|
|||||||
Reference in New Issue
Block a user