Fix #59 (Custom comparer in orderBy is ignored if key selector is cached). Also fixed doc comments.

Author: Athari

Tests/Unit/EnumerableTest.php

@@ -813,6 +813,9 @@ function testOrderBy()
         $this->assertEnumValuesSame(
             [ 2, 3, 9, 4 ],
             E::from([ 999 => 9, 2 => 2, 33 => 3, 4444 => 4 ])->orderBy('$k', $compareLen));
+        $this->assertEnumValuesSame(
+            [ 2, 3, 9, 4 ],
+            E::from([ 'aaa' => 9, 'b' => 2, 'cc' => 3, 'dddd' => 4 ])->orderBy('$k', $compareLen));
 
         // both keys and values sorted
         $this->assertEnumOrderSame(

YaLinqo/Enumerable.php

@@ -213,7 +213,7 @@ public function where($predicate): Enumerable
      * <p>Three methods are defined to extend the type {@link OrderedEnumerable}, which is the return type of this method. These three methods, namely {@link OrderedEnumerable::thenBy thenBy}, {@link OrderedEnumerable::thenByDescending thenByDescending} and {@link OrderedEnumerable::thenByDir thenByDir}, enable you to specify additional sort criteria to sort a sequence. These methods also return an OrderedEnumerable, which means any number of consecutive calls to thenBy, thenByDescending or thenByDir can be made.
      * <p>Because OrderedEnumerable inherits from Enumerable, you can call {@link orderBy}, {@link orderByDescending} or {@link orderByDir} on the results of a call to orderBy, orderByDescending, orderByDir, thenBy, thenByDescending or thenByDir. Doing this introduces a new primary ordering that ignores the previously established ordering.
      * <p>This method performs an unstable sort; that is, if the keys of two elements are equal, the order of the elements is not preserved. In contrast, a stable sort preserves the order of elements that have the same key. Internally, {@link usort} is used.
-     * @param int|bool $sortOrder A direction in which to order the elements: false or SORT_DESC for ascending (by increasing value), true or SORT_ASC for descending (by decreasing value).
+     * @param int|bool $sortOrder A direction in which to order the elements: false or SORT_ASC for ascending (by increasing value), true or SORT_DESC for descending (by decreasing value).
      * @param callable|string|null $keySelector {(v, k) ==> key} A function to extract a key from an element. Default: value.
      * @param callable|string|int|null $comparer {(a, b) ==> diff} Difference between a and b: &lt;0 if a&lt;b; 0 if a==b; &gt;0 if a&gt;b. Can also be a combination of SORT_ flags.
      * @return OrderedEnumerable

YaLinqo/OrderedEnumerable.php

@@ -33,7 +33,7 @@ class OrderedEnumerable extends Enumerable
     /**
      * @internal
      * @param Enumerable $source
-     * @param int|bool $sortOrder A direction in which to order the elements: false or SORT_DESC for ascending (by increasing value), true or SORT_ASC for descending (by decreasing value).
+     * @param int|bool $sortOrder A direction in which to order the elements: false or SORT_ASC for ascending (by increasing value), true or SORT_DESC for descending (by decreasing value).
      * @param int $sortFlags Sort flags for array_multisort.
      * @param bool $isReversed Whether comparer result needs to be negated (used in usort).
      * @param callable $keySelector {(v, k) ==> key} A function to extract a key from an element.
@@ -65,7 +65,7 @@ private function getSingleComparer()
      * <p>Three methods are defined to extend the type OrderedEnumerable, which is the return type of this method. These three methods, namely {@link thenBy}, {@link thenByDescending} and {@link thenByDir}, enable you to specify additional sort criteria to sort a sequence. These methods also return an OrderedEnumerable, which means any number of consecutive calls to thenBy, thenByDescending or thenByDir can be made.
      * <p>Because OrderedEnumerable inherits from {@link Enumerable}, you can call {@link Enumerable::orderBy orderBy}, {@link Enumerable::orderByDescending orderByDescending} or {@link Enumerable::orderByDir orderByDir} on the results of a call to orderBy, orderByDescending, orderByDir, thenBy, thenByDescending or thenByDir. Doing this introduces a new primary ordering that ignores the previously established ordering.
      * <p>This method performs an unstable sort; that is, if the keys of two elements are equal, the order of the elements is not preserved. In contrast, a stable sort preserves the order of elements that have the same key. Internally, {@link usort} is used.
-     * @param int|bool $sortOrder A direction in which to order the elements: false or SORT_DESC for ascending (by increasing value), true or SORT_ASC for descending (by decreasing value).
+     * @param int|bool $sortOrder A direction in which to order the elements: false or SORT_ASC for ascending (by increasing value), true or SORT_DESC for descending (by decreasing value).
      * @param callable|string|null $keySelector {(v, k) ==> key} A function to extract a key from an element. Default: value.
      * @param callable|string|int|null $comparer {(a, b) ==> diff} Difference between a and b: &lt;0 if a&lt;b; 0 if a==b; &gt;0 if a&gt;b. Can also be a combination of SORT_ flags.
      * @return \YaLinqo\OrderedEnumerable
@@ -136,7 +136,7 @@ private function trySortBySingleField($array, bool $canMultisort)
                 arsort($array, $this->sortFlags);
         }
         elseif ($this->keySelector === Functions::$key) {
-            if ($canMultisort)
+            if (!$canMultisort)
                 uksort($array, $this->getSingleComparer());
             elseif ($this->sortOrder == SORT_ASC)
                 ksort($array, $this->sortFlags);

YaLinqo/Utils.php

@@ -26,10 +26,10 @@ class Utils
     private static $compareFunctionToSortFlags = [
         null => SORT_REGULAR,
         'strcmp' => SORT_STRING,
-        'strcasecmp' => 10 /*SORT_STRING | SORT_FLAG_CASE*/,
+        'strcasecmp' => SORT_STRING | SORT_FLAG_CASE,
         'strcoll' => SORT_LOCALE_STRING,
         'strnatcmp' => SORT_NATURAL,
-        'strnatcasecmp' => 14 /*SORT_NATURAL | SORT_FLAG_CASE*/,
+        'strnatcasecmp' => SORT_NATURAL | SORT_FLAG_CASE,
     ];
 
     /**

readme.md

@@ -1,6 +1,5 @@
 # *YaLinqo: Yet Another LINQ to Objects for PHP*
 
-[![Travis CI Status](https://img.shields.io/travis/Athari/YaLinqo.svg)](https://travis-ci.org/Athari/YaLinqo)
 [![Coveralls Coverage](https://img.shields.io/coveralls/Athari/YaLinqo/master.svg)](https://coveralls.io/r/Athari/YaLinqo)
 [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/Athari/YaLinqo.svg)](https://scrutinizer-ci.com/g/Athari/YaLinqo)
 [![Packagist Downloads](https://img.shields.io/packagist/dt/athari/yalinqo.svg)](https://packagist.org/packages/athari/yalinqo)