Merge branch 'release/2.0.0'

Author: sebastiaanluca

.travis.yml

@@ -1,8 +1,9 @@
 language: php
 
 php:
-- 7.2
-- nightly
+- "7.2"
+- "7.3"
+- 7.4snapshot
 
 cache:
   directories:
@@ -15,10 +16,11 @@ env:
 
 matrix:
   allow_failures:
-  - php: nightly
+  - php: 7.4snapshot
   fast_finish: true
 
 before_install:
+- composer validate --strict
 - travis_retry composer self-update
 
 install:

CHANGELOG.md

@@ -6,13 +6,21 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ## Unreleased
 
+## 2.0.0 (2019-02-27)
+
+### Changed
+
+- Renamed `Constants` to `Enum` to better reflect their purpose
+- Upgraded to PHPUnit 8
+- Test against PHP 7.3 and 7.4
+
 ## 1.0.0 (2018-07-22)
 
 ### Added
 
 - rand_bool helper
 - str_wrap helper
-_ is\_assoc\_array helper
+- is\_assoc\_array helper
 - array_expand helper
 - array_without helper
 - array\_pull\_value helper

README.md

@@ -377,35 +377,35 @@ See the [ddd helper](#ddd) for example output.
 
 ## Class helpers
 
-### Constants trait
+### Enum trait
 
-The primary use of the `Constants` trait is to enable you to store all constants of a specific type in a single class or value object and have it return those with a single call.
+The primary use of the `Enum` trait is to enable you to store all cases of a specific type in a single class or value object and have it return those with a single call.
 
-This can be useful for instance when your database uses integers to store states, but you want to use descriptive strings throughout your code (i.e. enums). It also allows you to refactor these constants at any time without having to waste time searching your code for any raw values (and probably miss a few, introducing new bugs along the way).
+This can be useful for instance when your database uses integers to store states, but you want to use descriptive strings throughout your code (i.e. enums). It also allows you to refactor these elements at any time without having to waste time searching your code for any raw values (and probably miss a few, introducing new bugs along the way).
 
-#### Retrieving constants
+#### Retrieving elements
 
-Returns an array of constant keys and their values.
+Returns an array of element keys and their values.
 
 ```php
 <?php
 
-use SebastiaanLuca\PhpHelpers\Classes\Constants;
+use SebastiaanLuca\PhpHelpers\Classes\Enum;
 
 class UserStates
 {
-    use Constants;
+    use Enum;
 
     public const REGISTERED = 'registered';
     public const ACTIVATED = 'activated';
     public const DISABLED = 'disabled';
 }
 
-UserStates::constants();
+UserStates::enums();
 
 // or
 
-(new UserStates)->constants();
+(new UserStates)->enums();
 
 /*
 [
@@ -416,18 +416,18 @@ UserStates::constants();
 */
 ```
 
-#### Retrieving constant keys
+#### Retrieving element keys
 
-Returns all the keys of constants in a class.
+Returns all the keys of the elements in an enum.
 
 ```php
 <?php
 
-use SebastiaanLuca\PhpHelpers\Classes\Constants;
+use SebastiaanLuca\PhpHelpers\Classes\Enum;
 
 class UserStates
 {
-    use Constants;
+    use Enum;
 
     public const REGISTERED = 'registered';
     public const ACTIVATED = 'activated';
@@ -447,16 +447,16 @@ UserStates::keys();
 
 #### Retrieving constant values
 
-Returns all the values of constants in a class.
+Returns all the values of the elements in an enum.
 
 ```php
 <?php
 
-use SebastiaanLuca\PhpHelpers\Classes\Constants;
+use SebastiaanLuca\PhpHelpers\Classes\Enum;
 
 class UserStates
 {
-    use Constants;
+    use Enum;
 
     public const REGISTERED = 'registered';
     public const ACTIVATED = 'activated';
@@ -561,7 +561,7 @@ composer test
 
 ## Contributing
 
-Please see [CONTRIBUTING](CONTRIBUTING.md) and [CONDUCT](CONDUCT.md) for details.
+Please see [CONTRIBUTING](CONTRIBUTING.md) and [CODE OF CONDUCT](CODE_OF_CONDUCT.md) for details.
 
 ## Security
 

composer.json

@@ -26,9 +26,9 @@
         "php": "^7.2"
     },
     "require-dev": {
-        "kint-php/kint": "^2.2",
-        "nesbot/carbon": "^1.22",
-        "phpunit/phpunit": "^7.2"
+        "kint-php/kint": "^3.1",
+        "nesbot/carbon": "^1.22|^2.0",
+        "phpunit/phpunit": "^8.0"
     },
     "suggest": {
         "kint-php/kint": "A powerful and modern PHP debugging tool. Required for the debug helpers.",
@@ -48,10 +48,18 @@
             "SebastiaanLuca\\PhpHelpers\\Tests\\": "tests"
         }
     },
-    "scripts": {
-        "test": "vendor/bin/phpunit"
-    },
     "config": {
         "sort-packages": true
+    },
+    "scripts": {
+        "test": "vendor/bin/phpunit",
+        "test-lowest": [
+            "composer update --prefer-lowest --prefer-dist --no-interaction --ansi",
+            "@test"
+        ],
+        "test-stable": [
+            "composer update --prefer-stable --prefer-dist --no-interaction --ansi",
+            "@test"
+        ]
     }
 }

phpunit.xml

@@ -13,7 +13,9 @@
          stopOnFailure="false"
          failOnRisky="true"
          failOnWarning="true"
-         stopOnError="false">
+         stopOnError="false"
+         cacheResult="false"
+         cacheTokens="false">
     <testsuites>
         <testsuite name="Feature Tests">
             <directory suffix="Test.php">./tests/Feature</directory>

src/Classes/Constants.php src/Classes/Enum.phpsrc/Classes/Constants.php renamed to src/Classes/Enum.php

@@ -4,35 +4,35 @@
 
 use ReflectionClass;
 
-trait Constants
+trait Enum
 {
     /**
-     * Get all the class constants.
+     * Get all the elements of the enumerator.
      *
      * @return array
      */
-    public static function constants() : array
+    public static function enums() : array
     {
         return (new ReflectionClass(__CLASS__))->getConstants();
     }
 
     /**
-     * Get all the names of the class constants.
+     * Get all the names of the elements.
      *
      * @return array
      */
     public static function keys() : array
     {
-        return array_keys(static::constants());
+        return array_keys(static::enums());
     }
 
     /**
-     * Get all the values of the class constants.
+     * Get all the values of the elements.
      *
      * @return array
      */
     public static function values() : array
     {
-        return array_values(static::constants());
+        return array_values(static::enums());
     }
 }

tests/Unit/Classes/ConstantsHelperTest.php

@@ -2,7 +2,7 @@
 
 namespace SebastiaanLuca\Helpers\Tests\Unit\Classes;
 
-use SebastiaanLuca\PhpHelpers\Classes\Constants;
+use SebastiaanLuca\PhpHelpers\Classes\Enum;
 use SebastiaanLuca\PhpHelpers\Tests\TestCase;
 
 class ConstantsHelperTest extends TestCase
@@ -14,7 +14,7 @@ public function it returns all constants() : void
     {
         $class = new class
         {
-            use Constants;
+            use Enum;
 
             public const FIRST_CONSTANT = 1;
             public const SECOND_CONSTANT = 2;
@@ -25,7 +25,7 @@ public function it returns all constants() : void
             'FIRST_CONSTANT' => 1,
             'SECOND_CONSTANT' => 2,
             'THIRD_CONSTANT' => 3,
-        ], $class::constants());
+        ], $class::enums());
     }
 
     /**
@@ -35,7 +35,7 @@ public function it returns all constant names() : void
     {
         $class = new class
         {
-            use Constants;
+            use Enum;
 
             public const FIRST_CONSTANT = 1;
             public const SECOND_CONSTANT = 2;
@@ -56,7 +56,7 @@ public function it returns all constant values() : void
     {
         $class = new class
         {
-            use Constants;
+            use Enum;
 
             public const FIRST_CONSTANT = 1;
             public const SECOND_CONSTANT = 'two';

tests/Unit/Functions/GenericHelpersTest.php

@@ -12,7 +12,7 @@ class GenericHelpersTest extends TestCase
      */
     public function rand_bool returns a random bool() : void
     {
-        $this->assertInternalType('bool', rand_bool());
+        $this->assertIsBool(rand_bool());
     }
 
     /**
@@ -153,9 +153,9 @@ public function temporary_file creates a temporary file and returns its 
         $this->assertArrayHasKey('file', $file);
         $this->assertArrayHasKey('path', $file);
 
-        $this->assertInternalType('resource', $file['file']);
+        $this->assertIsResource($file['file']);
 
-        $this->assertInternalType('string', $file['path']);
+        $this->assertIsString($file['path']);
         $this->assertFileExists($file['path']);
     }