Skip to content

Commit

Permalink
Merge branch 'master' of github.com:cocur/chain
Browse files Browse the repository at this point in the history
  • Loading branch information
florianeckerstorfer committed Nov 11, 2018
2 parents a9347a6 + 5473d57 commit 37c70fa
Show file tree
Hide file tree
Showing 67 changed files with 138 additions and 63 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015 Florian Eckerstorfer
Copyright (c) 2015-2018 Florian Eckerstorfer

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ All of these methods manipulate the array, but not all of them return an instanc
- `->intersect(array|Chain)`
- `->intersectAssoc(array|Chain)`
- `->intersectKey(array|Chain)`
- `->keys()`
- `->map(callable)`
- `->merge(array|Chain)`
- `->pad(int, mixed)`
Expand All @@ -148,6 +149,7 @@ All of these methods manipulate the array, but not all of them return an instanc
- `->sum()`
- `->unique()`
- `->unshift(mixed)`
- `->values()`

### Array Access

Expand Down
2 changes: 1 addition & 1 deletion src/AbstractChain.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Chain.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
abstract class AbstractChain implements ArrayAccess, IteratorAggregate, JsonSerializable
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Count.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Count.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Count
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/CountValues.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* CountValues.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait CountValues
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Diff.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Diff.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Diff
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Fill.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Fill.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Fill
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Filter.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Filter.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Filter
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/First.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* First.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait First
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Flip.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Flip.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Flip
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Intersect.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Intersect.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Intersect
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/IntersectAssoc.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* IntersectAssoc.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait IntersectAssoc
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/IntersectKey.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* IntersectKey.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait IntersectKey
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/KeyExists.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* KeyExists.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait KeyExists
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Keys.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Keys.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Keys
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Last.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Last.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Last
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Map.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Map.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Map
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Merge.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Merge.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Merge
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Pad.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Pad.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Pad
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Pop.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Pop.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Pop
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Product.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Product.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Product
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Push.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Push.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Push
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Rand.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Rand.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Rand
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Replace.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Replace.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Replace
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Reverse.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Reverse.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Reverse
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Search.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Search.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Search
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Shift.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Shift.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Shift
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Shuffle.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Shuffle.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Shuffle
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Slice.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Slice.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Slice
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Splice.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Splice.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Splice
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Sum.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Sum.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Sum
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Unique.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Unique.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Unique
{
Expand Down
2 changes: 1 addition & 1 deletion src/Link/Unshift.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Unshift.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Unshift
{
Expand Down
24 changes: 24 additions & 0 deletions src/Link/Values.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

namespace Cocur\Chain\Link;

use Cocur\Chain\Chain;

/**
* Values.
*
* @author Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
*/
trait Values
{
/**
* @return Chain
*/
public function values()
{
$this->array = array_values($this->array);

return $this;
}
}
2 changes: 1 addition & 1 deletion tests/ChainTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* ChainTest.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
* @group unit
*/
class ChainTest extends PHPUnit_Framework_TestCase
Expand Down
2 changes: 1 addition & 1 deletion tests/Link/CountTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* CountTest.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
* @group unit
*/
class CountTest extends PHPUnit_Framework_TestCase
Expand Down
2 changes: 1 addition & 1 deletion tests/Link/CountValuesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* CountValuesTest.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
* @group unit
*/
class CountValuesTest extends PHPUnit_Framework_TestCase
Expand Down
2 changes: 1 addition & 1 deletion tests/Link/DiffTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* DiffTest.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
* @group unit
*/
class DiffTest extends PHPUnit_Framework_TestCase
Expand Down
2 changes: 1 addition & 1 deletion tests/Link/FillTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* FillTest.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
* @group unit
*/
class FillTest extends PHPUnit_Framework_TestCase
Expand Down
2 changes: 1 addition & 1 deletion tests/Link/FirstTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* FirstTest.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
* @group unit
*/
class FirstTest extends PHPUnit_Framework_TestCase
Expand Down
2 changes: 1 addition & 1 deletion tests/Link/FlipTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* FlipTest.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
* @group unit
*/
class FlipTest extends PHPUnit_Framework_TestCase
Expand Down
2 changes: 1 addition & 1 deletion tests/Link/IntersectAssocTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* IntersectAssocTest.
*
* @author Florian Eckerstorfer
* @copyright 2015 Florian Eckerstorfer
* @copyright 2015-2018 Florian Eckerstorfer
* @group unit
*/
class IntersectAssocTest extends PHPUnit_Framework_TestCase
Expand Down
Loading

0 comments on commit 37c70fa

Please sign in to comment.