#4: Update the Permutations generator.

Author: Pol Dellaiera

src/Generators/Permutations.php

@@ -18,7 +18,7 @@ class Permutations extends Combinatorics {
    *
    * @var \drupol\phpermutations\Generators\Combinations
    */
-  public $combinations;
+  protected $combinations;
 
   /**
    * Combinatorics constructor.
@@ -36,28 +36,13 @@ public function __construct(array $dataset = array(), $length = NULL) {
   /**
    * Alias of the get() method.
    *
-   * @return \Generator
-   *   The prime generator.
-   */
-  public function generator() {
-    return $this->get($this->getDataset(), $this->getLength());
-  }
-
-  /**
-   * The combination generator.
-   *
-   * @param array $dataset
-   *   The dataset.
-   * @param int $length
-   *   The length.
-   *
    * @codingStandardsIgnoreStart
    * @return \Generator
    * @codingStandardsIgnoreEnd
    */
-  protected function get(array $dataset, $length) {
+  public function generator() {
     foreach ($this->combinations->generator() as $combination) {
-      foreach ($this->getPermutations($combination) as $current) {
+      foreach ($this->get($combination) as $current) {
         yield $current;
       }
     }
@@ -73,15 +58,15 @@ protected function get(array $dataset, $length) {
    * @return \Generator
    * @codingStandardsIgnoreEnd
    */
-  protected function getPermutations(array $dataset) {
+  protected function get(array $dataset) {
     foreach ($dataset as $key => $firstItem) {
       $remaining = $dataset;
       array_splice($remaining, $key, 1);
       if (count($remaining) === 0) {
         yield [$firstItem];
         continue;
       }
-      foreach ($this->getPermutations($remaining) as $permutation) {
+      foreach ($this->get($remaining) as $permutation) {
         array_unshift($permutation, $firstItem);
         yield $permutation;
       }