Changelog > update > enter latest modifications

Arrays > getNonEmptyValuesAsString() method > returns non-empty values concatenated by given separator

.gitignore

@@ -1,5 +1,5 @@
 # ------------------------------------------------------------------------------
-# Environment-related parameters
+### Environment-related parameters
 # ------------------------------------------------------------------------------
 .env
 
@@ -51,42 +51,15 @@
 
 
 # ------------------------------------------------------------------------------
-### Compiled source
-# ------------------------------------------------------------------------------
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.so
-
-
-# ------------------------------------------------------------------------------
-### Shell scripts
-# ------------------------------------------------------------------------------
-/*.sh
-
-
-# ------------------------------------------------------------------------------
-### JetBrains
+### JetBrains template
 # ------------------------------------------------------------------------------
 /.idea
 
 
 # ------------------------------------------------------------------------------
-### NetBeans template
-# ------------------------------------------------------------------------------
-nbproject/private/
-nbbuild/
-dist/
-nbdist/
-nbactions.xml
-.nb-gradle/
-
-
-# ------------------------------------------------------------------------------
-### OSX template
+### macOS template
 # ------------------------------------------------------------------------------
+# General
 .DS_Store
 .AppleDouble
 .LSOverride
@@ -104,6 +77,7 @@ Icon
 .TemporaryItems
 .Trashes
 .VolumeIcon.icns
+.com.apple.timemachine.donotpresent
 
 # Directories potentially created on remote AFP share
 .AppleDB
@@ -127,16 +101,23 @@ Temporary Items
 # Linux trash folder which might appear on any partition or disk
 .Trash-*
 
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
 
 # ------------------------------------------------------------------------------
 ### Windows template
 # ------------------------------------------------------------------------------
-# Windows image file caches
+# Windows thumbnail cache files
 Thumbs.db
 ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
 
 # Folder config file
-Desktop.ini
+[Dd]esktop.ini
 
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
@@ -144,6 +125,7 @@ $RECYCLE.BIN/
 # Windows Installer files
 *.cab
 *.msi
+*.msix
 *.msm
 *.msp
 

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 Common and useful classes, methods, exceptions etc.
 
+# 0.1.5
+
+1. Tests > Date > one more test case
+2. Phing > update configuration
+3. Miscellaneous > variableDump() method > remove, because unnecessary
+4. Regex > createSlug() method > returns slug for given value
+5. Arrays > getNonEmptyValues() method > returns non-empty values, e.g. without "" (empty string), null or []
+6. Arrays > getNonEmptyValuesAsString() method > returns non-empty values concatenated by given separator
+7. ValueObject > Company > represents a company
+8. ValueObject > BankAccount > represents bank account
+9. ValueObject > Address > represents address of company, institution, user etc.
+
 # 0.1.4
 
 1. Phing > update configuration

README.md

@@ -20,6 +20,8 @@ composer require meritoo/common-library
 2. [Collection of elements](docs/Collection-of-elements.md)
 3. [Exceptions](docs/Static-methods.md)
 4. [Static methods](docs/Static-methods.md)
+   1. [Arrays](docs/Static-methods/Arrays.md)
+   2. [Regex](docs/Static-methods/Regex.md)
 5. [Value Objects](docs/Value-Objects.md)
 
 # Development

VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

composer.json

@@ -10,6 +10,10 @@
         }
     ],
     "require": {
+        "ext-dom": "*",
+        "ext-fileinfo": "*",
+        "ext-json": "*",
+        "ext-simplexml": "*",
         "php": ">=5.6",
         "ext-intl": "*",
         "ext-pcre": "*",

docs/Base-test-case.md

@@ -48,6 +48,8 @@ class MimeTypesTest extends BaseTestCase
 2. [Collection of elements](Collection-of-elements.md)
 3. [Exceptions](Exceptions.md)
 4. [Static methods](Static-methods.md)
+   1. [Arrays](Static-methods/Arrays.md)
+   2. [Regex](Static-methods/Regex.md)
 5. [Value Objects](Value-Objects.md)
 
 [‹ Back to `Readme`](../README.md)

docs/Collection-of-elements.md

@@ -46,6 +46,8 @@ var_dump($simpleCollection->has('dolor')); // bool(true)
 2. [**Collection of elements**](Collection-of-elements.md)
 3. [Exceptions](Exceptions.md)
 4. [Static methods](Static-methods.md)
+   1. [Arrays](Static-methods/Arrays.md)
+   2. [Regex](Static-methods/Regex.md)
 5. [Value Objects](Value-Objects.md)
 
 [‹ Back to `Readme`](../README.md)

docs/Exceptions.md

@@ -57,6 +57,8 @@ class UnknownSimpleTypeException extends UnknownTypeException
 2. [Collection of elements](Collection-of-elements.md)
 3. [**Exceptions**](Exceptions.md)
 4. [Static methods](Static-methods.md)
+   1. [Arrays](Static-methods/Arrays.md)
+   2. [Regex](Static-methods/Regex.md)
 5. [Value Objects](Value-Objects.md)
 
 [‹ Back to `Readme`](../README.md)

docs/Static-methods.md

@@ -19,6 +19,8 @@ var_dump($firstElement); // string(5) "lorem"
 2. [Collection of elements](Collection-of-elements.md)
 3. [Exceptions](Exceptions.md)
 4. [**Static methods**](Static-methods.md)
+   1. [Arrays](Static-methods/Arrays.md)
+   2. [Regex](Static-methods/Regex.md)
 5. [Value Objects](Value-Objects.md)
 
 [‹ Back to `Readme`](../README.md)

docs/Static-methods/Arrays.md

@@ -0,0 +1,78 @@
+# Meritoo Common Library
+
+Common and useful classes, methods, exceptions etc.
+
+# Arrays
+
+> Useful methods related to arrays
+
+Class: `Meritoo\Common\Utilities\Arrays`
+File: `src/Utilities/Arrays.php`
+
+### getNonEmptyValues(array $values)
+
+> Returns non-empty values, e.g. without "" (empty string), null or []
+
+##### Arguments
+
+- `array $values` - The values to filter
+
+##### Example 1
+
+- values: `[]` (no values)
+- result: `[]` (an empty array)
+
+##### Example 2
+
+- values: `[null, ""]` (all empty values)
+- result: `[]` (an empty array)
+
+##### Example 3
+
+- values: `["test 1", "", 123, null, 0]`
+- result: `["test 1", 123, 0]`
+
+### getNonEmptyValuesAsString(array $values, $separator = ', ')
+
+> Returns non-empty values concatenated by given separator
+
+##### Arguments
+
+- `array $values` - The values to filter
+- `[string $separator]` - (optional) Separator used to implode the values. Default: ", ".
+
+##### Example 1
+
+- values: `[]` (no values)
+- separator: default or any other string
+- result: `""` (an empty string)
+
+##### Example 2
+
+- values: `[null, ""]` (all empty values)
+- separator: default or any other string
+- result: `""` (an empty string)
+
+##### Example 3
+
+- values: `["test 1", "", 123, null, 0]`
+- separator: `", "` (default)
+- result: `"test 1, 123, 0"`
+
+##### Example 4
+
+- values: `["test 1", "", 123, null, 0]`
+- separator: `" | "`
+- result: `"test 1 | 123 | 0"`
+
+# More
+
+1. [Base test case (with common methods and data providers)](../Base-test-case.md)
+2. [Collection of elements](../Collection-of-elements.md)
+3. [Exceptions](../Exceptions.md)
+4. [Static methods](../Static-methods.md)
+   1. [**Arrays**](Arrays.md)
+   2. [Regex](Regex.md)
+5. [Value Objects](../Value-Objects.md)
+
+[‹ Back to `Readme`](../../README.md)

docs/Static-methods/Regex.md

@@ -0,0 +1,45 @@
+# Meritoo Common Library
+
+Common and useful classes, methods, exceptions etc.
+
+# Regex
+
+> Useful methods related to regular expressions
+
+Class: `Meritoo\Common\Utilities\Regex`
+File: `src/Utilities/Regex.php`
+
+### createSlug($value)
+
+> Returns slug for given value
+
+##### Arguments
+
+- `string $value` - Value that should be transformed to slug
+
+##### Example 1
+
+- value: non-scalar or `null`
+- result: `false`
+
+##### Example 2
+
+- value: `""` (an empty string)
+- result: `""` (an empty string)
+
+##### Example 3
+
+- value: `"Lorem ipsum. Dolor sit 12.34 amet."`
+- result: `"lorem-ipsum-dolor-sit-1234-amet"`
+
+# More
+
+1. [Base test case (with common methods and data providers)](../Base-test-case.md)
+2. [Collection of elements](../Collection-of-elements.md)
+3. [Exceptions](../Exceptions.md)
+4. [Static methods](../Static-methods.md)
+   1. [Arrays](../Static-methods/Arrays.md)
+   2. [**Regex**](Regex.md)
+5. [Value Objects](../Value-Objects.md)
+
+[‹ Back to `Readme`](../../README.md)

docs/Value-Objects.md

@@ -4,7 +4,138 @@ Common and useful classes, methods, exceptions etc.
 
 # Value Objects
 
-Located in `Meritoo\Common\ValueObject` namespace.
+Located in `Meritoo\Common\ValueObject` namespace and in `src/ValueObject/` directory.
+
+### Address
+
+##### Namespace
+
+`Meritoo\Common\ValueObject\Address`
+
+##### Info
+
+Represents address of company, institution, user etc. Contains properties:
+1. `$street` - the street
+2. `$buildingNumber` - the number of building
+3. `$flatNumber` - the number of flat
+4. `$zipCode` - the zip code
+5. `$city` - the city, location
+
+##### New instance
+
+New instance can be created using constructor
+
+```php
+new Address('New York', '00123', '4th Avenue', '10', '200');
+```
+
+##### Methods
+
+Has getters for each property, e.g. `getFlatNumber()` or `getZipCode()`, and 1 extra method:
+
+```php
+getFullStreet()
+```
+
+that returns name of street with related numbers (building & flat number).
+
+Example:
+
+```php
+$address = new Address('New York', '00123', '4th Avenue', '10', '200');
+$fullStreet = $address->getFullStreet(); // "4th Avenue 10/200"
+```
+
+##### Conversion to string (the `__toString()` method)
+
+Instance of `Address` may be represented as string that contains all non-empty properties separated by `, `.
+
+Example:
+
+```php
+$address = new Address('New York', '00123', '4th Avenue', '10', '200');
+$asString = (string)$address; // "4th Avenue 10/200, 00123, New York"
+```
+
+### BankAccount
+
+##### Namespace
+
+`Meritoo\Common\ValueObject\BankAccount`
+
+##### Info
+
+Represents bank account. Contains properties:
+1. `$bankName` - name of bank
+2. $accountNumber` - number of bank's account
+
+##### New instance
+
+New instance can be created using constructor
+
+```php
+new BankAccount('Bank of America', '1234567890')
+```
+
+##### Methods
+
+Has getters for each property `getBankName()` and `getAccountNumber()`.
+
+##### Conversion to string (the `__toString()` method)
+
+Instance of `BankAccount` may be represented as string that contains all non-empty properties separated by `, `.
+
+Example:
+
+```php
+$bank = new BankAccount('Bank of America', '1234567890');
+$asString = (string)$bank; // "Bank of America, 1234567890"
+```
+
+### Company
+
+##### Namespace
+
+`Meritoo\Common\ValueObject\Company`
+
+##### Info
+
+Represents a company. Contains properties:
+1. `$name` - name of company
+2. `$address` - address of company
+3. `$bankAccount` - bank account of company
+
+##### New instance
+
+New instance can be created using constructor:
+
+```php
+new Company(
+    'Test 1',
+    new Address('New York', '00123', '4th Avenue', '10', '200'),
+    new BankAccount('Bank 1', '12345')
+);
+```
+
+##### Methods
+
+Has getters for each property `getName()`, `getAddress()` and `getBankAccount()`.
+
+##### Conversion to string (the `__toString()` method)
+
+Instance of `Company` may be represented as string that contains all non-empty properties separated by `, `.
+
+Example:
+
+```php
+$company = new Company(
+    'Test 1',
+    new Address('New York', '00123', '4th Avenue', '10', '200'),
+    new BankAccount('Bank 1', '12345')
+);
+
+$asString = (string)$company; // "Test 1, 4th Avenue 10/200, 00123, New York, Bank 1, 12345"
+```
 
 ### Version
 
@@ -14,7 +145,7 @@ Located in `Meritoo\Common\ValueObject` namespace.
 
 ##### Info
 
-Represents version of software. Contains 3 properties:
+Represents version of software. Contains properties:
 1. `$majorPart` - the "major" part of version
 2. `$minorPart` - the "minor" part of version
 3. `$patchPart` - the "patch" part of version
@@ -48,6 +179,8 @@ New instance can be created using:
 2. [Collection of elements](Collection-of-elements.md)
 3. [Exceptions](Exceptions.md)
 4. [Static methods](Static-methods.md)
+   1. [Arrays](Static-methods/Arrays.md)
+   2. [Regex](Static-methods/Regex.md)
 5. [**Value Objects**](Value-Objects.md)
 
 [‹ Back to `Readme`](../README.md)

phing/composer-install.sh

@@ -7,7 +7,7 @@ EXPECTED_SIGNATURE="$(curl -L https://composer.github.io/installer.sig)"
 php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 ACTUAL_SIGNATURE="$(php -r "echo hash_file('SHA384', 'composer-setup.php');")"
 
-if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]
+if [[ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]]
 then
     >&2 echo 'ERROR: Invalid installer signature'
     rm composer-setup.php
@@ -17,4 +17,4 @@ fi
 php composer-setup.php --quiet
 RESULT=$?
 rm composer-setup.php
-exit $RESULT
+exit ${RESULT}

src/Collection/Collection.php

@@ -130,11 +130,12 @@ class Collection implements Countable, ArrayAccess, IteratorAggregate
     {
         if (!empty($elements)) {
             foreach ($elements as $index => $element) {
-                if (!$useIndexes) {
-                    $index = null;
+                if ($useIndexes) {
+                    $this->add($element, $index);
+                    continue;
                 }
 
-                $this->add($element, $index);
+                $this->add($element);
             }
         }
 

src/Exception/Method/DisabledMethodException.php

@@ -28,13 +28,13 @@ class DisabledMethodException extends Exception
     public static function create($disabledMethod, $alternativeMethod = '')
     {
         $template = 'Method %s() cannot be called, because is disabled.';
+        $message = sprintf($template, $disabledMethod);
 
         if (!empty($alternativeMethod)) {
-            $template .= ' Use %s() instead.';
+            $template = '%s Use %s() instead.';
+            $message = sprintf($template, $message, $alternativeMethod);
         }
 
-        $message = sprintf($template, $disabledMethod, $alternativeMethod);
-
         return new static($message);
     }
 }

src/Utilities/Arrays.php

@@ -9,7 +9,7 @@
 namespace Meritoo\Common\Utilities;
 
 /**
- * Useful arrays methods
+ * Useful methods related to arrays
  *
  * @author    Meritoo <github@meritoo.pl>
  * @copyright Meritoo <http://www.meritoo.pl>
@@ -48,12 +48,10 @@ class Arrays
 
                 if (is_array($value)) {
                     $effect .= self::values2string($value, $arrayColumnKey, $separator);
-                } else {
-                    if (empty($arrayColumnKey)) {
-                        $effect .= $value;
-                    } elseif ($key === $arrayColumnKey) {
-                        $effect .= $array[$arrayColumnKey];
-                    }
+                } elseif (empty($arrayColumnKey)) {
+                    $effect .= $value;
+                } elseif ($key === $arrayColumnKey) {
+                    $effect .= $array[$arrayColumnKey];
                 }
             }
         }
@@ -111,8 +109,8 @@ class Arrays
                  */
 
                 if (is_array($row) && !empty($row)) {
-                    foreach ($row as &$value) {
-                        $value = html_entity_decode($value);
+                    foreach ($row as $key => $value) {
+                        $row[$key] = html_entity_decode($value);
                     }
 
                     $rows[] = implode($separator, $row);
@@ -363,7 +361,7 @@ class Arrays
          * Name of the variable was not provided and it's a multi dimensional array?
          * Let's create the name, because variable is required for later usage (related to multi dimensional array)
          */
-        if (self::isMultiDimensional($array) && empty($jsVariableName)) {
+        if (empty($jsVariableName) && $isMultiDimensional) {
             $jsVariableName = 'autoGeneratedVariable';
         }
 
@@ -384,13 +382,13 @@ class Arrays
             if (is_array($value)) {
                 $variable = $index;
 
-                if (is_integer($index)) {
+                if (is_int($index)) {
                     $variable = 'value_' . $variable;
                 }
 
                 $value = self::array2JavaScript($value, $variable, $preserveIndexes);
 
-                if (!empty($value)) {
+                if (null !== $value && '' !== $value) {
                     /*
                      * Add an empty line for the 1st iteration only. Required to avoid missing empty line after
                      * declaration of variable:
@@ -409,21 +407,19 @@ class Arrays
                         $effect .= "\n";
                     }
                 }
-            } else {
-                if ($preserveIndexes) {
-                    if (!empty($jsVariableName)) {
-                        $index = Miscellaneous::quoteValue($index);
-                        $effect .= sprintf("\n%s[%s] = %s;", $jsVariableName, $index, $value);
-                    }
-                } else {
-                    $format = '%s';
-
-                    if ($counter < $arrayCount) {
-                        $format .= ', ';
-                    }
-
-                    $effect .= sprintf($format, $value);
+            } elseif ($preserveIndexes) {
+                if (!empty($jsVariableName)) {
+                    $index = Miscellaneous::quoteValue($index);
+                    $effect .= sprintf("\n%s[%s] = %s;", $jsVariableName, $index, $value);
                 }
+            } else {
+                $format = '%s';
+
+                if ($counter < $arrayCount) {
+                    $format .= ', ';
+                }
+
+                $effect .= sprintf($format, $value);
             }
         }
 
@@ -474,7 +470,7 @@ class Arrays
     {
         if (is_string($item)) {
             if ($last) {
-                $item = substr($item, 0, strlen($item) - 1);
+                $item = substr($item, 0, -1);
             } else {
                 $item = substr($item, 1);
             }
@@ -517,7 +513,7 @@ class Arrays
          * No elements or the element does not exist?
          * Nothing to do
          */
-        if (empty($array) || !in_array($item, $array)) {
+        if (empty($array) || !in_array($item, $array, true)) {
             return false;
         }
 
@@ -556,19 +552,18 @@ class Arrays
 
             foreach ($array as $key => &$value) {
                 $remove = false;
+                $isArray = is_array($value);
 
-                if (is_array($value)) {
+                if ($isArray) {
                     self::removeElements($value, $needle, $before);
 
-                    if (is_array($value) && empty($value)) {
+                    if ($isArray && empty($value)) {
                         $remove = true;
                     }
+                } elseif ($value === $needle) {
+                    break;
                 } else {
-                    if ($value === $needle) {
-                        break;
-                    } else {
-                        $remove = true;
-                    }
+                    $remove = true;
                 }
 
                 if ($remove) {
@@ -749,7 +744,7 @@ class Arrays
         foreach ($exploded as $item) {
             $exploded2 = explode($valuesKeysSeparator, $item);
 
-            if (2 == count($exploded2)) {
+            if (2 === count($exploded2)) {
                 $key = trim($exploded2[0]);
                 $value = trim($exploded2[1]);
 
@@ -781,19 +776,17 @@ class Arrays
                 if ($firstKey) {
                     $effect = $exists;
                     $firstKey = false;
+                } elseif ($explicit) {
+                    $effect = $effect && $exists;
+
+                    if (!$effect) {
+                        break;
+                    }
                 } else {
-                    if ($explicit) {
-                        $effect = $effect && $exists;
+                    $effect = $effect || $exists;
 
-                        if (!$effect) {
-                            break;
-                        }
-                    } else {
-                        $effect = $effect || $exists;
-
-                        if ($effect) {
-                            break;
-                        }
+                    if ($effect) {
+                        break;
                     }
                 }
             }
@@ -839,6 +832,7 @@ class Arrays
         foreach ($array as $key => $value) {
             $path = $key;
             $stopRecursion = false;
+            $valueIsArray = is_array($value);
 
             /*
              * If the path of parent element is delivered,
@@ -871,7 +865,7 @@ class Arrays
              * or
              * - the process is stopped, recursive is not used
              */
-            if (!is_array($value) || (is_array($value) && empty($value)) || $stopRecursion) {
+            if (!$valueIsArray || ($valueIsArray && empty($value)) || $stopRecursion) {
                 $paths[$path] = $value;
                 continue;
             }
@@ -879,7 +873,7 @@ class Arrays
             /*
              * Let's iterate through the next level, using recursive
              */
-            if (is_array($value)) {
+            if ($valueIsArray) {
                 $recursivePaths = self::getLastElementsPaths($value, $separator, $path, $stopIfMatchedBy);
                 $paths += $recursivePaths;
             }
@@ -1100,7 +1094,8 @@ class Arrays
                 $recursiveValues = self::getAllValuesOfKey($value, $key);
 
                 if (!empty($recursiveValues)) {
-                    $values = array_merge($values, $recursiveValues);
+                    $merged = array_merge($values, $recursiveValues);
+                    $values = $merged;
                 }
             }
         }
@@ -1282,7 +1277,7 @@ class Arrays
             }
 
             if (Regex::endsWith($element, $separator)) {
-                $element = substr($element, 0, strlen($element) - 1);
+                $element = substr($element, 0, -1);
             }
         }
 
@@ -1354,7 +1349,7 @@ class Arrays
          * Values should be compared only and both arrays are one-dimensional?
          * Let's find difference by using simple function
          */
-        if ($valuesOnly && 1 == self::getDimensionsCount($array1) && 1 == self::getDimensionsCount($array2)) {
+        if ($valuesOnly && 1 === self::getDimensionsCount($array1) && 1 === self::getDimensionsCount($array2)) {
             return array_diff($array1, $array2);
         }
 
@@ -1371,58 +1366,55 @@ class Arrays
                     if ($array2HasKey && is_array($array2[$key])) {
                         $difference = self::arrayDiffRecursive($value, $array2[$key], $valuesOnly);
                     }
-                } else {
+                } elseif (!$array2HasKey || ($array2HasKey && $value !== $array2[$key])) {
                     /*
-                     * 2nd array hasn't key from 1st array?
+                     * We are here, because:
+                     * a) 2nd array hasn't key from 1st array
                      * OR
-                     * Key exists in both, 1st and 2nd array, but values are different?
+                     * b) key exists in both, 1st and 2nd array, but values are different
                      */
-                    if (!$array2HasKey || ($array2HasKey && $value != $array2[$key])) {
-                        $difference = $value;
-                    }
+                    $difference = $value;
                 }
 
                 if (null !== $difference) {
                     $effect[] = $difference;
                 }
-            } else {
+
                 /*
-                * The key exists in 2nd array?
-                */
-                if ($array2HasKey) {
-                    /*
-                     * The value it's an array (it's a nested array)?
-                     */
-                    if (is_array($value)) {
-                        $diff = [];
+                 * The key exists in 2nd array?
+                 */
+            } elseif ($array2HasKey) {
+                /*
+                 * The value it's an array (it's a nested array)?
+                 */
+                if (is_array($value)) {
+                    $diff = [];
 
-                        if (is_array($array2[$key])) {
-                            /*
-                             * Let's verify the nested array
-                             */
-                            $diff = self::arrayDiffRecursive($value, $array2[$key], $valuesOnly);
-                        }
-
-                        if (empty($diff)) {
-                            continue;
-                        }
-
-                        $effect[$key] = $diff;
-                    } else {
+                    if (is_array($array2[$key])) {
                         /*
-                         * Value is different than in 2nd array?
-                         * OKay, I've got difference
+                         * Let's verify the nested array
                          */
-                        if ($value != $array2[$key]) {
-                            $effect[$key] = $value;
-                        }
+                        $diff = self::arrayDiffRecursive($value, $array2[$key], $valuesOnly);
                     }
-                } else {
+
+                    if (empty($diff)) {
+                        continue;
+                    }
+
+                    $effect[$key] = $diff;
+
                     /*
+                     * Value is different than in 2nd array?
                      * OKay, I've got difference
                      */
+                } elseif ($value !== $array2[$key]) {
                     $effect[$key] = $value;
                 }
+            } else {
+                /*
+                 * OKay, I've got difference
+                 */
+                $effect[$key] = $value;
             }
         }
 
@@ -1581,6 +1573,52 @@ class Arrays
         return $dimensionsCount;
     }
 
+    /**
+     * Returns non-empty values, e.g. without "" (empty string), null or []
+     *
+     * @param array $values The values to filter
+     * @return array
+     */
+    public static function getNonEmptyValues(array $values)
+    {
+        /*
+         * No values?
+         * Nothing to do
+         */
+        if (empty($values)) {
+            return [];
+        }
+
+        return array_filter($values, function ($value) {
+            $nonEmptyScalar = is_scalar($value) && '' !== $value;
+            $nonEmptyArray = is_array($value) && !empty($value);
+
+            return $nonEmptyScalar || $nonEmptyArray || is_object($value);
+        });
+    }
+
+    /**
+     * Returns non-empty values concatenated by given separator
+     *
+     * @param array  $values    The values to filter
+     * @param string $separator (optional) Separator used to implode the values. Default: ", ".
+     * @return string
+     */
+    public static function getNonEmptyValuesAsString(array $values, $separator = ', ')
+    {
+        $nonEmpty = self::getNonEmptyValues($values);
+
+        /*
+         * No values?
+         * Nothing to do
+         */
+        if (empty($nonEmpty)) {
+            return '';
+        }
+
+        return implode($separator, $nonEmpty);
+    }
+
     /**
      * Returns neighbour (next or previous element) for given element
      *
@@ -1595,17 +1633,17 @@ class Arrays
         $noPrevious = !$next && self::isFirstElement($array, $element);
 
         /*
-         * No elements?
-         * OR
-         * Given element does not exist in given array?
+         * Previous neighbour should be returned and given element is first?
          * OR
          * Next neighbour should be returned and given element is last?
          * OR
-         * Previous neighbour should be returned and given element is first?
+         * No elements?
+         * OR
+         * Given element does not exist in given array?
          *
          * Nothing to do
          */
-        if (empty($array) || !in_array($element, $array) || $noNext || $noPrevious) {
+        if ($noPrevious || $noNext || empty($array) || !in_array($element, $array, true)) {
             return null;
         }
 

src/Utilities/Date.php

@@ -140,7 +140,12 @@ class Date
                 $dateStart = new DateTime();
                 $dateEnd = new DateTime();
 
-                if (DatePeriod::LAST_YEAR === $period || DatePeriod::NEXT_YEAR === $period) {
+                $yearPeriod = [
+                    DatePeriod::LAST_YEAR,
+                    DatePeriod::NEXT_YEAR,
+                ];
+
+                if (in_array($period, $yearPeriod, true)) {
                     $yearDifference = 1;
 
                     if (DatePeriod::LAST_YEAR === $period) {
@@ -167,7 +172,7 @@ class Date
             return null;
         }
 
-        $dateStart->setTime(0, 0, 0);
+        $dateStart->setTime(0, 0);
         $dateEnd->setTime(23, 59, 59);
 
         return new DatePeriod($dateStart, $dateEnd);
@@ -217,7 +222,8 @@ class Date
 
         return $dateTime
             ->setTime($hour, $minute, $second)
-            ->format($format);
+            ->format($format)
+            ;
     }
 
     /**
@@ -349,7 +355,7 @@ class Date
      *
      * @param string|DateTime $dateStart      The start date
      * @param string|DateTime $dateEnd        The end date
-     * @param int             $differenceUnit (optional) Unit of date difference. One of this class
+     * @param string          $differenceUnit (optional) Unit of date difference. One of this class
      *                                        DATE_DIFFERENCE_UNIT_* constants. If is set to null all units are
      *                                        returned in the array.
      * @return array|int

src/Utilities/Locale.php

@@ -52,7 +52,7 @@ class Locale
             LC_MESSAGES,
         ];
 
-        if (empty($languageCode) || !in_array($category, $availableCategories)) {
+        if (empty($languageCode) || !in_array($category, $availableCategories, true)) {
             return false;
         }
 

src/Utilities/MimeTypes.php

@@ -733,7 +733,7 @@ class MimeTypes
      */
     public static function getExtension($mimeType)
     {
-        if (is_string($mimeType) && in_array($mimeType, self::$mimeTypes)) {
+        if (is_string($mimeType) && in_array($mimeType, self::$mimeTypes, true)) {
             $data = Arrays::setKeysAsValues(self::$mimeTypes, false);
 
             return $data[$mimeType];
@@ -806,7 +806,7 @@ class MimeTypes
      */
     public static function isImage($mimeType)
     {
-        if (in_array($mimeType, self::$mimeTypes)) {
+        if (in_array($mimeType, self::$mimeTypes, true)) {
             return (bool)preg_match('|^image/.+$|', $mimeType);
         }
 

src/Utilities/Miscellaneous.php

@@ -296,34 +296,6 @@ class Miscellaneous
         return $effect;
     }
 
-    /**
-     * Displays variable content as preformatted text (fixed-width font and preserves both spaces and line breaks)
-     *
-     * If xdebug php module is loaded, displays variable using var_dump(), otherwise <pre>var_dump()</pre>.
-     * You can pass as many variables as you wish.
-     *
-     * Pass each variable as argument of this function. Amount unlimited. Variables are loaded using the
-     * func_get_args() function (@see http://pl1.php.net/manual/en/function.func-get-args.php).
-     */
-    public static function variableDump()
-    {
-        $xdebugLoaded = self::isPhpModuleLoaded('xdebug');
-
-        if (!$xdebugLoaded) {
-            echo '<pre>';
-        }
-
-        $arguments = func_get_args();
-
-        foreach ($arguments as $argument) {
-            var_dump($argument);
-        }
-
-        if (!$xdebugLoaded) {
-            echo '</pre>';
-        }
-    }
-
     /**
      * Returns information if given PHP module is compiled and loaded
      *

src/Utilities/QueryBuilderUtility.php

@@ -10,7 +10,6 @@ namespace Meritoo\Common\Utilities;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\OptimisticLockException;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\Query\Parameter;
 use Doctrine\ORM\QueryBuilder;
@@ -91,7 +90,7 @@ class QueryBuilderUtility
      * @param array        $criteria     (optional) The criteria used in WHERE clause. It may simple array with pairs
      *                                   key-value or an array of arrays where second element of sub-array is the
      *                                   comparison operator. Example below.
-     * @param string       $alias        (optional) Alias used in the query
+     * @param string|null  $alias        (optional) Alias used in the query
      * @return QueryBuilder
      *
      * Example of the $criteria argument:
@@ -107,7 +106,7 @@ class QueryBuilderUtility
      *      'position' => 5,
      * ]
      */
-    public static function setCriteria(QueryBuilder $queryBuilder, array $criteria = [], $alias = '')
+    public static function setCriteria(QueryBuilder $queryBuilder, array $criteria = [], $alias = null)
     {
         /*
          * No criteria used in WHERE clause?
@@ -121,7 +120,7 @@ class QueryBuilderUtility
          * No alias provided?
          * Let's use root alias
          */
-        if (empty($alias)) {
+        if (null === $alias || '' === $alias) {
             $alias = self::getRootAlias($queryBuilder);
         }
 
@@ -129,7 +128,7 @@ class QueryBuilderUtility
             $compareOperator = '=';
 
             if (is_array($value) && !empty($value)) {
-                if (2 == count($value)) {
+                if (2 === count($value)) {
                     $compareOperator = $value[1];
                 }
 
@@ -158,7 +157,6 @@ class QueryBuilderUtility
      * @param array|ArrayCollection $entities      The entities to delete
      * @param bool                  $flushDeleted  (optional) If is set to true, flushes the deleted objects (default
      *                                             behaviour). Otherwise - not.
-     * @throws OptimisticLockException
      * @return bool
      */
     public static function deleteEntities(EntityManager $entityManager, $entities, $flushDeleted = true)

src/Utilities/Regex.php

@@ -12,7 +12,7 @@ use Meritoo\Common\Exception\Regex\IncorrectColorHexLengthException;
 use Meritoo\Common\Exception\Regex\InvalidColorHexValueException;
 
 /**
- * Useful regular expressions methods
+ * Useful methods related to regular expressions
  *
  * @author    Meritoo <github@meritoo.pl>
  * @copyright Meritoo <http://www.meritoo.pl>
@@ -102,7 +102,7 @@ class Regex
          * Tax ID is not 10 characters length OR is not numeric?
          * Nothing to do
          */
-        if (10 !== strlen($taxId) || !is_numeric($taxId)) {
+        if (!is_numeric($taxId) || 10 !== strlen($taxId)) {
             return false;
         }
 
@@ -125,14 +125,11 @@ class Regex
         }
 
         /*
-         * Last number it's not a remainder from dividing per 11?
-         * Nothing to do
+         * Last number it's a remainder from dividing per 11?
+         * Tax ID is valid
          */
-        if ($sum % 11 == $taxId[9]) {
-            return true;
-        }
 
-        return false;
+        return $sum % 11 === (int)$taxId[9];
     }
 
     /**
@@ -248,7 +245,7 @@ class Regex
 
             if ($itsRegularExpression) {
                 $matchesCount = preg_match($filterExpression, $value);
-                $remove = 0 == $matchesCount;
+                $remove = 0 === $matchesCount;
             } else {
                 if (is_string($value)) {
                     $value = sprintf('\'%s\'', $value);
@@ -306,11 +303,9 @@ class Regex
 
             if ($mustAllMatch) {
                 $effect = $effect && $matched;
-            } else {
-                if ($matched) {
-                    $effect = $matched;
-                    break;
-                }
+            } elseif ($matched) {
+                $effect = $matched;
+                break;
             }
         }
 
@@ -501,7 +496,7 @@ class Regex
     public static function startsWith($string, $beginning)
     {
         if (!empty($string) && !empty($beginning)) {
-            if (1 == strlen($beginning) && !self::isLetterOrDigit($beginning)) {
+            if (1 === strlen($beginning) && !self::isLetterOrDigit($beginning)) {
                 $beginning = '\\' . $beginning;
             }
 
@@ -522,7 +517,7 @@ class Regex
      */
     public static function endsWith($string, $ending)
     {
-        if (1 == strlen($ending) && !self::isLetterOrDigit($ending)) {
+        if (1 === strlen($ending) && !self::isLetterOrDigit($ending)) {
             $ending = '\\' . $ending;
         }
 
@@ -607,7 +602,7 @@ class Regex
      */
     public static function contains($haystack, $needle)
     {
-        if (1 == strlen($needle) && !self::isLetterOrDigit($needle)) {
+        if (1 === strlen($needle) && !self::isLetterOrDigit($needle)) {
             $needle = '\\' . $needle;
         }
 
@@ -694,14 +689,14 @@ class Regex
      */
     public static function isValidNip($nip)
     {
-        $nip = preg_replace('/[^0-9]/', '', $nip);
+        $nip = preg_replace('/[\D]/', '', $nip);
 
         $invalidNips = [
             '1234567890',
             '0000000000',
         ];
 
-        if (!preg_match('/^[0-9]{10}$/', $nip) || in_array($nip, $invalidNips)) {
+        if (!preg_match('/^[\d]{10}$/', $nip) || in_array($nip, $invalidNips, true)) {
             return false;
         }
 
@@ -723,9 +718,9 @@ class Regex
         }
 
         $modulo = $sum % 11;
-        $numberControl = (10 == $modulo) ? 0 : $modulo;
+        $numberControl = (10 === $modulo) ? 0 : $modulo;
 
-        return $numberControl == $nip[9];
+        return $numberControl === (int)$nip[9];
     }
 
     /**
@@ -924,4 +919,37 @@ class Regex
 
         return (bool)preg_match($pattern, $value);
     }
+
+    /**
+     * Returns slug for given value
+     *
+     * @param string $value Value that should be transformed to slug
+     * @return string|bool
+     */
+    public static function createSlug($value)
+    {
+        /*
+         * Not a scalar value?
+         * Nothing to do
+         */
+        if (!is_scalar($value)) {
+            return false;
+        }
+
+        /*
+         * It's an empty string?
+         * Nothing to do
+         */
+        if ('' === $value) {
+            return '';
+        }
+
+        $id = 'Latin-ASCII; NFD; [:Nonspacing Mark:] Remove; NFC; [:Punctuation:] Remove; Lower();';
+        $transliterator = \Transliterator::create($id);
+
+        $cleanValue = trim($value);
+        $result = $transliterator->transliterate($cleanValue);
+
+        return preg_replace('/[-\s]+/', '-', $result);
+    }
 }

src/Utilities/Uri.php

@@ -93,7 +93,7 @@ class Uri
         /*
          * Oops, cannot match protocol
          */
-        if (0 == $matchCount) {
+        if (0 === $matchCount) {
             return '';
         }
 

src/Utilities/Xml.php

@@ -40,7 +40,7 @@ class Xml
         $query = $path->query('/*/*');
         $nodesCount = $query->length;
 
-        if (0 == $nodesCount) {
+        if (0 === $nodesCount) {
             return $element1;
         }
 

src/ValueObject/Address.php

@@ -0,0 +1,159 @@
+<?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\ValueObject;
+
+use Meritoo\Common\Utilities\Arrays;
+
+/**
+ * Address
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+class Address
+{
+    /**
+     * The street
+     *
+     * @var string
+     */
+    protected $street;
+
+    /**
+     * The number of building
+     *
+     * @var string
+     */
+    protected $buildingNumber;
+
+    /**
+     * The number of flat
+     *
+     * @var string
+     */
+    protected $flatNumber;
+
+    /**
+     * The zip code
+     *
+     * @var string
+     */
+    protected $zipCode;
+
+    /**
+     * The city, location
+     *
+     * @var string
+     */
+    protected $city;
+
+    /**
+     * Class constructor
+     *
+     * @param string $city           City, location
+     * @param string $zipCode        The zip code
+     * @param string $street         The street
+     * @param string $buildingNumber The number of building
+     * @param string $flatNumber     (optional) The number of flat. Default: "".
+     */
+    public function __construct($city, $zipCode, $street, $buildingNumber, $flatNumber = '')
+    {
+        $this->city = $city;
+        $this->zipCode = $zipCode;
+        $this->street = $street;
+        $this->buildingNumber = $buildingNumber;
+        $this->flatNumber = $flatNumber;
+    }
+
+    /**
+     * Returns representation of object as string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        $values = [
+            $this->getFullStreet(),
+            $this->zipCode,
+            $this->city,
+        ];
+
+        return Arrays::getNonEmptyValuesAsString($values);
+    }
+
+    /**
+     * Returns street
+     *
+     * @return string
+     */
+    public function getStreet()
+    {
+        return $this->street;
+    }
+
+    /**
+     * Returns full street (name + building & flat number)
+     *
+     * @return string
+     */
+    public function getFullStreet()
+    {
+        if (empty($this->street)) {
+            return '';
+        }
+
+        $numbers = $this->buildingNumber;
+
+        if (!empty($numbers) && !empty($this->flatNumber)) {
+            $numbers = sprintf('%s/%s', $numbers, $this->flatNumber);
+        }
+
+        return sprintf('%s %s', $this->street, $numbers);
+    }
+
+    /**
+     * Returns number of building
+     *
+     * @return string
+     */
+    public function getBuildingNumber()
+    {
+        return $this->buildingNumber;
+    }
+
+    /**
+     * Returns number of flat
+     *
+     * @return string
+     */
+    public function getFlatNumber()
+    {
+        return $this->flatNumber;
+    }
+
+    /**
+     * Returns zip code
+     *
+     * @return string
+     */
+    public function getZipCode()
+    {
+        return $this->zipCode;
+    }
+
+    /**
+     * Returns city, location
+     *
+     * @return string
+     */
+    public function getCity()
+    {
+        return $this->city;
+    }
+}

src/ValueObject/BankAccount.php

@@ -0,0 +1,81 @@
+<?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\ValueObject;
+
+use Meritoo\Common\Utilities\Arrays;
+
+/**
+ * Bank account
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+class BankAccount
+{
+    /**
+     * Name of bank
+     *
+     * @var string
+     */
+    protected $bankName;
+
+    /**
+     * Number of bank's account
+     *
+     * @var string
+     */
+    protected $accountNumber;
+
+    /**
+     * Class constructor
+     *
+     * @param string $bankName      Name of bank
+     * @param string $accountNumber Number of bank's account
+     */
+    public function __construct($bankName, $accountNumber)
+    {
+        $this->bankName = $bankName;
+        $this->accountNumber = $accountNumber;
+    }
+
+    /**
+     * Returns representation of object as string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        $values = [
+            $this->bankName,
+            $this->accountNumber,
+        ];
+
+        return Arrays::getNonEmptyValuesAsString($values);
+    }
+
+    /**
+     * Returns name of bank
+     *
+     * @return string
+     */
+    public function getBankName()
+    {
+        return $this->bankName;
+    }
+
+    /**
+     * Returns number of bank's account
+     *
+     * @return string
+     */
+    public function getAccountNumber()
+    {
+        return $this->accountNumber;
+    }
+}

src/ValueObject/Company.php

@@ -0,0 +1,101 @@
+<?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\ValueObject;
+
+use Meritoo\Common\Utilities\Arrays;
+
+/**
+ * Company
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+class Company
+{
+    /**
+     * Name of company
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * Address of company
+     *
+     * @var Address
+     */
+    protected $address;
+
+    /**
+     * Bank account of company
+     *
+     * @var BankAccount
+     */
+    protected $bankAccount;
+
+    /**
+     * Class constructor
+     *
+     * @param string           $name        Name of company
+     * @param Address          $address     Address of company
+     * @param BankAccount|null $bankAccount (optional) Bank account of company
+     */
+    public function __construct($name, Address $address, BankAccount $bankAccount = null)
+    {
+        $this->name = $name;
+        $this->address = $address;
+        $this->bankAccount = $bankAccount;
+    }
+
+    /**
+     * Returns representation of object as string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        $values = [
+            $this->name,
+            $this->address,
+            $this->bankAccount,
+        ];
+
+        return Arrays::getNonEmptyValuesAsString($values);
+    }
+
+    /**
+     * Returns name of company
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Returns address of company
+     *
+     * @return Address
+     */
+    public function getAddress()
+    {
+        return $this->address;
+    }
+
+    /**
+     * Returns bank account of company
+     *
+     * @return BankAccount|null
+     */
+    public function getBankAccount()
+    {
+        return $this->bankAccount;
+    }
+}

tests/Utilities/Arrays/SimpleToString.php

@@ -0,0 +1,44 @@
+<?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\Test\Utilities\Arrays;
+
+/**
+ * Simple class convertible to string.
+ * Used for testing the Arrays class.
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+class SimpleToString
+{
+    /**
+     * Identifier
+     *
+     * @var string
+     */
+    private $id;
+
+    /**
+     * Class constructor
+     *
+     * @param string $id Identifier
+     */
+    public function __construct($id)
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __toString()
+    {
+        return sprintf('Instance with ID: %s', $this->id);
+    }
+}

tests/Utilities/ArraysTest.php

@@ -9,6 +9,7 @@
 namespace Meritoo\Common\Test\Utilities;
 
 use Meritoo\Common\Test\Base\BaseTestCase;
+use Meritoo\Common\Test\Utilities\Arrays\SimpleToString;
 use Meritoo\Common\Utilities\Arrays;
 
 /**
@@ -1486,6 +1487,43 @@ letsTest[2] = value_2;';
         self::assertTrue(Arrays::isMultiDimensional($this->complexArray));
     }
 
+    /**
+     * @param string $description Description of test case
+     * @param array  $values      The values to filter
+     * @param array  $expected    Expected non-empty values
+     *
+     * @dataProvider provideValuesToFilterNonEmpty
+     */
+    public function testGetNonEmptyValues($description, array $values, array $expected)
+    {
+        self::assertSame($expected, Arrays::getNonEmptyValues($values), $description);
+    }
+
+    /**
+     * @param string $description Description of test case
+     * @param array  $values      The values to filter
+     * @param string $expected    Expected non-empty values (as string)
+     *
+     * @dataProvider provideValuesToFilterNonEmptyAsStringUsingDefaultSeparator
+     */
+    public function testGetNonEmptyValuesAsStringUsingDefaultSeparator($description, array $values, $expected)
+    {
+        self::assertSame($expected, Arrays::getNonEmptyValuesAsString($values), $description);
+    }
+
+    /**
+     * @param string $description Description of test case
+     * @param array  $values      The values to filter
+     * @param string $separator   Separator used to implode the values
+     * @param string $expected    Expected non-empty values (as string)
+     *
+     * @dataProvider provideValuesToFilterNonEmptyAsString
+     */
+    public function testGetNonEmptyValuesAsString($description, array $values, $separator, $expected)
+    {
+        self::assertSame($expected, Arrays::getNonEmptyValuesAsString($values, $separator), $description);
+    }
+
     /**
      * Provides simple array to set/replace values with keys
      *
@@ -1807,6 +1845,264 @@ letsTest[2] = value_2;';
         ];
     }
 
+    /**
+     * Provide values to filter and get non-empty values
+     *
+     * @return \Generator
+     */
+    public function provideValuesToFilterNonEmpty()
+    {
+        $simpleObject = new SimpleToString('1234');
+
+        yield[
+            'An empty array (no values to filter)',
+            [],
+            [],
+        ];
+
+        yield[
+            'All values are empty',
+            [
+                '',
+                null,
+                [],
+            ],
+            [],
+        ];
+
+        yield[
+            '5 values with 2 empty strings',
+            [
+                'test 1',
+                '',
+                'test 2',
+                'test 3',
+                '',
+            ],
+            [
+                0 => 'test 1',
+                2 => 'test 2',
+                3 => 'test 3',
+            ],
+        ];
+
+        yield[
+            '"0" shouldn\'t be treated like an empty value',
+            [
+                123,
+                0,
+                456,
+            ],
+            [
+                123,
+                0,
+                456,
+            ],
+        ];
+
+        yield[
+            'Object shouldn\'t be treated like an empty value',
+            [
+                'test 1',
+                $simpleObject,
+                'test 2',
+                null,
+                'test 3',
+            ],
+            [
+                0 => 'test 1',
+                1 => $simpleObject,
+                2 => 'test 2',
+                4 => 'test 3',
+            ],
+        ];
+
+        yield[
+            'Mixed values (non-empty, empty, strings, integers, objects)',
+            [
+                'test 1',
+                '',
+                123,
+                null,
+                'test 2',
+                'test 3',
+                0,
+                $simpleObject,
+                456,
+                [],
+                $simpleObject,
+            ],
+            [
+                0  => 'test 1',
+                2  => 123,
+                4  => 'test 2',
+                5  => 'test 3',
+                6  => 0,
+                7  => $simpleObject,
+                8  => 456,
+                10 => $simpleObject,
+            ],
+        ];
+    }
+
+    /**
+     * Provide values to filter and get non-empty values concatenated by default separator
+     *
+     * @return \Generator
+     */
+    public function provideValuesToFilterNonEmptyAsStringUsingDefaultSeparator()
+    {
+        yield[
+            'An empty array (no values to filter)',
+            [],
+            '',
+        ];
+
+        yield[
+            'All values are empty',
+            [
+                '',
+                null,
+                [],
+            ],
+            '',
+        ];
+
+        yield[
+            '5 values with 2 empty strings',
+            [
+                'test 1',
+                '',
+                'test 2',
+                'test 3',
+                '',
+            ],
+            'test 1, test 2, test 3',
+        ];
+
+        yield[
+            'Numbers with "0" that shouldn\'t be treated like an empty value',
+            [
+                123,
+                0,
+                456,
+            ],
+            '123, 0, 456',
+        ];
+
+        yield[
+            'Object shouldn\'t be treated like an empty value',
+            [
+                'test 1',
+                new SimpleToString('1234'),
+                'test 2',
+                null,
+                'test 3',
+            ],
+            'test 1, Instance with ID: 1234, test 2, test 3',
+        ];
+
+        yield[
+            'Mixed values (non-empty, empty, strings, integers, objects)',
+            [
+                'test 1',
+                '',
+                123,
+                null,
+                'test 2',
+                'test 3',
+                0,
+                new SimpleToString('A1XC90Z'),
+                456,
+                [],
+                new SimpleToString('FF-45-0Z'),
+            ],
+            'test 1, 123, test 2, test 3, 0, Instance with ID: A1XC90Z, 456, Instance with ID: FF-45-0Z',
+        ];
+    }
+
+    /**
+     * Provide values to filter and get non-empty values concatenated by given separator
+     *
+     * @return \Generator
+     */
+    public function provideValuesToFilterNonEmptyAsString()
+    {
+        yield[
+            'An empty array (no values to filter)',
+            [],
+            ' | ',
+            '',
+        ];
+
+        yield[
+            'All values are empty',
+            [
+                '',
+                null,
+                [],
+            ],
+            ' | ',
+            '',
+        ];
+
+        yield[
+            '5 values with 2 empty strings',
+            [
+                'test 1',
+                '',
+                'test 2',
+                'test 3',
+                '',
+            ],
+            ' | ',
+            'test 1 | test 2 | test 3',
+        ];
+
+        yield[
+            'Numbers with "0" that shouldn\'t be treated like an empty value',
+            [
+                123,
+                0,
+                456,
+            ],
+            ' <-> ',
+            '123 <-> 0 <-> 456',
+        ];
+
+        yield[
+            'Object shouldn\'t be treated like an empty value',
+            [
+                'test 1',
+                new SimpleToString('1234'),
+                'test 2',
+                null,
+                'test 3',
+            ],
+            ' | ',
+            'test 1 | Instance with ID: 1234 | test 2 | test 3',
+        ];
+
+        yield[
+            'Mixed values (non-empty, empty, strings, integers, objects)',
+            [
+                'test 1',
+                '',
+                123,
+                null,
+                'test 2',
+                'test 3',
+                0,
+                new SimpleToString('A1XC90Z'),
+                456,
+                [],
+                new SimpleToString('FF-45-0Z'),
+            ],
+            ';',
+            'test 1;123;test 2;test 3;0;Instance with ID: A1XC90Z;456;Instance with ID: FF-45-0Z',
+        ];
+    }
+
     /**
      * {@inheritdoc}
      */

tests/Utilities/DateTest.php

@@ -279,9 +279,18 @@ class DateTest extends BaseTestCase
         self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_YEARS));
         self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_YEARS));
 
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_MONTHS));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_MONTHS));
+
         self::assertEquals(1, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_DAYS));
         self::assertEquals(1, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_DAYS));
 
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_HOURS));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_HOURS));
+
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_MINUTES));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_MINUTES));
+
         /*
          * Difference of 1 day (using the relative date format)
          */
@@ -294,8 +303,10 @@ class DateTest extends BaseTestCase
         ];
 
         self::assertEquals($effect, Date::getDateDifference(new DateTime('yesterday'), new DateTime('midnight')));
+        self::assertEquals(0, Date::getDateDifference(new DateTime('yesterday'), new DateTime('midnight'), Date::DATE_DIFFERENCE_UNIT_MONTHS));
         self::assertEquals(1, Date::getDateDifference(new DateTime('yesterday'), new DateTime('midnight'), Date::DATE_DIFFERENCE_UNIT_DAYS));
         self::assertEquals(0, Date::getDateDifference(new DateTime('yesterday'), new DateTime('midnight'), Date::DATE_DIFFERENCE_UNIT_HOURS));
+        self::assertEquals(0, Date::getDateDifference(new DateTime('yesterday'), new DateTime('midnight'), Date::DATE_DIFFERENCE_UNIT_MINUTES));
     }
 
     public function testGetDateDifferenceOneDayTwoHours()
@@ -320,6 +331,12 @@ class DateTest extends BaseTestCase
         self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_YEARS));
         self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_YEARS));
 
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_MONTHS));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_MONTHS));
+
+        self::assertEquals(1, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_DAYS));
+        self::assertEquals(1, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_DAYS));
+
         self::assertEquals(2, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_HOURS));
         self::assertEquals(2, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_HOURS));
 
@@ -355,10 +372,141 @@ class DateTest extends BaseTestCase
         self::assertEquals(41, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_DAYS));
         self::assertEquals(41, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_DAYS));
 
+        self::assertEquals(4, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_HOURS));
+        self::assertEquals(4, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_HOURS));
+
         self::assertEquals(30, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_MINUTES));
         self::assertEquals(30, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_MINUTES));
     }
 
+    public function testGetDateDifferenceNewYear()
+    {
+        $dateStart = '2017-12-31 23:59';
+        $dateEnd = '2018-01-01 00:00';
+
+        $effect = [
+            Date::DATE_DIFFERENCE_UNIT_YEARS   => 0,
+            Date::DATE_DIFFERENCE_UNIT_MONTHS  => 0,
+            Date::DATE_DIFFERENCE_UNIT_DAYS    => 0,
+            Date::DATE_DIFFERENCE_UNIT_HOURS   => 0,
+            Date::DATE_DIFFERENCE_UNIT_MINUTES => 1,
+        ];
+
+        self::assertEquals($effect, Date::getDateDifference($dateStart, $dateEnd));
+        self::assertEquals($effect, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd)));
+
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_YEARS));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_YEARS));
+
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_MONTHS));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_MONTHS));
+
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_DAYS));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_DAYS));
+
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_HOURS));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_HOURS));
+
+        self::assertEquals(1, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_MINUTES));
+        self::assertEquals(1, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_MINUTES));
+    }
+
+    public function testGetDateDifferenceLessThan24Hours()
+    {
+        $dateStart = '2017-01-01 16:00';
+        $dateEnd = '2017-01-02 10:00';
+
+        $effect = [
+            Date::DATE_DIFFERENCE_UNIT_YEARS   => 0,
+            Date::DATE_DIFFERENCE_UNIT_MONTHS  => 0,
+            Date::DATE_DIFFERENCE_UNIT_DAYS    => 0,
+            Date::DATE_DIFFERENCE_UNIT_HOURS   => 18,
+            Date::DATE_DIFFERENCE_UNIT_MINUTES => 0,
+        ];
+
+        self::assertEquals($effect, Date::getDateDifference($dateStart, $dateEnd));
+        self::assertEquals($effect, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd)));
+
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_YEARS));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_YEARS));
+
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_MONTHS));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_MONTHS));
+
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_DAYS));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_DAYS));
+
+        self::assertEquals(18, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_HOURS));
+        self::assertEquals(18, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_HOURS));
+
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_MINUTES));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_MINUTES));
+    }
+
+    public function testGetDateDifferenceEqual24Hours()
+    {
+        $dateStart = '2017-01-01 00:00';
+        $dateEnd = '2017-01-02 00:00';
+
+        $effect = [
+            Date::DATE_DIFFERENCE_UNIT_YEARS   => 0,
+            Date::DATE_DIFFERENCE_UNIT_MONTHS  => 0,
+            Date::DATE_DIFFERENCE_UNIT_DAYS    => 1,
+            Date::DATE_DIFFERENCE_UNIT_HOURS   => 0,
+            Date::DATE_DIFFERENCE_UNIT_MINUTES => 0,
+        ];
+
+        self::assertEquals($effect, Date::getDateDifference($dateStart, $dateEnd));
+        self::assertEquals($effect, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd)));
+
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_YEARS));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_YEARS));
+
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_MONTHS));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_MONTHS));
+
+        self::assertEquals(1, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_DAYS));
+        self::assertEquals(1, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_DAYS));
+
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_HOURS));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_HOURS));
+
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_MINUTES));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_MINUTES));
+    }
+
+    public function testGetDateDifferenceInvertedDates()
+    {
+        $dateStart = '2017-01-02 10:00';
+        $dateEnd = '2017-01-01 16:00';
+
+        $effect = [
+            Date::DATE_DIFFERENCE_UNIT_YEARS   => 0,
+            Date::DATE_DIFFERENCE_UNIT_MONTHS  => 0,
+            Date::DATE_DIFFERENCE_UNIT_DAYS    => -1,
+            Date::DATE_DIFFERENCE_UNIT_HOURS   => 6,
+            Date::DATE_DIFFERENCE_UNIT_MINUTES => 0,
+        ];
+
+        self::assertEquals($effect, Date::getDateDifference($dateStart, $dateEnd));
+        self::assertEquals($effect, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd)));
+
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_YEARS));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_YEARS));
+
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_MONTHS));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_MONTHS));
+
+        self::assertEquals(-1, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_DAYS));
+        self::assertEquals(-1, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_DAYS));
+
+        self::assertEquals(6, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_HOURS));
+        self::assertEquals(6, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_HOURS));
+
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_MINUTES));
+        self::assertEquals(0, Date::getDateDifference(new DateTime($dateStart), new DateTime($dateEnd), Date::DATE_DIFFERENCE_UNIT_MINUTES));
+    }
+
     public function testGetDateDifferenceNoDifference()
     {
         /*
@@ -384,6 +532,12 @@ class DateTest extends BaseTestCase
         self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_MONTHS));
         self::assertEquals(0, Date::getDateDifference(new DateTime(), new DateTime(), Date::DATE_DIFFERENCE_UNIT_MONTHS));
 
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_DAYS));
+        self::assertEquals(0, Date::getDateDifference(new DateTime(), new DateTime(), Date::DATE_DIFFERENCE_UNIT_DAYS));
+
+        self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_HOURS));
+        self::assertEquals(0, Date::getDateDifference(new DateTime(), new DateTime(), Date::DATE_DIFFERENCE_UNIT_HOURS));
+
         self::assertEquals(0, Date::getDateDifference($dateStart, $dateEnd, Date::DATE_DIFFERENCE_UNIT_MINUTES));
         self::assertEquals(0, Date::getDateDifference(new DateTime(), new DateTime(), Date::DATE_DIFFERENCE_UNIT_MINUTES));
     }

tests/Utilities/MiscellaneousTest.php

@@ -156,33 +156,6 @@ class MiscellaneousTest extends BaseTestCase
         self::assertFalse(Miscellaneous::isPhpModuleLoaded('xyz123'));
     }
 
-    public function testVariableDump()
-    {
-        $xdebugLoaded = Miscellaneous::isPhpModuleLoaded('xdebug');
-
-        $variable = 123;
-        $expected = "int(123)\n";
-
-        if ($xdebugLoaded) {
-            $libraryPath = realpath(sprintf('%s%s', __DIR__, '/../..'));
-            $filePath = sprintf('%s%s', $libraryPath, '/src/Utilities/Miscellaneous.php:');
-
-            /*
-             * Attention. I have to use "\d+" at the end of $filePath, because number of line may be different if new
-             * method / function will be created.
-             */
-            $filePathQuoted = sprintf('%s\d+\:', preg_quote($filePath, '/'));
-
-            $expectedPattern = sprintf("/%s\n%s/", $filePathQuoted, preg_quote($expected, '/'));
-            $this->expectOutputRegex($expectedPattern);
-        } else {
-            $expected = sprintf('<pre>%s</pre>', $expected);
-            $this->expectOutputString($expected);
-        }
-
-        Miscellaneous::variableDump($variable);
-    }
-
     /**
      * @param mixed $string Empty value, e.g. ""
      * @dataProvider provideEmptyValue

tests/Utilities/RegexTest.php

@@ -12,7 +12,6 @@ use Generator;
 use Meritoo\Common\Exception\Regex\IncorrectColorHexLengthException;
 use Meritoo\Common\Exception\Regex\InvalidColorHexValueException;
 use Meritoo\Common\Test\Base\BaseTestCase;
-use ReflectionException;
 
 /**
  * Test case of the useful regular expressions methods
@@ -25,9 +24,6 @@ class RegexTest extends BaseTestCase
     private $simpleText;
     private $camelCaseText;
 
-    /**
-     * @throws ReflectionException
-     */
     public function testConstructor()
     {
         static::assertHasNoConstructor(Regex::class);
@@ -553,10 +549,6 @@ class RegexTest extends BaseTestCase
 
     /**
      * @param mixed $nonScalarValue Non scalar value, e.g. [] or null
-     *
-     * @throws IncorrectColorHexLengthException
-     * @throws InvalidColorHexValueException
-     *
      * @dataProvider provideNonScalarValue
      */
     public function testGetValidColorHexValueUsingNonScalarValue($nonScalarValue)
@@ -566,10 +558,6 @@ class RegexTest extends BaseTestCase
 
     /**
      * @param mixed $emptyValue Empty value, e.g. ""
-     *
-     * @throws IncorrectColorHexLengthException
-     * @throws InvalidColorHexValueException
-     *
      * @dataProvider provideColorEmptyValue
      */
     public function testGetValidColorHexValueUsingEmptyValueWithoutException($emptyValue)
@@ -579,10 +567,6 @@ class RegexTest extends BaseTestCase
 
     /**
      * @param mixed $emptyValue Empty value, e.g. ""
-     *
-     * @throws IncorrectColorHexLengthException
-     * @throws InvalidColorHexValueException
-     *
      * @dataProvider provideColorEmptyValue
      */
     public function testGetValidColorHexValueUsingEmptyValue($emptyValue)
@@ -593,10 +577,6 @@ class RegexTest extends BaseTestCase
 
     /**
      * @param string $incorrectColor Incorrect value of color
-     *
-     * @throws IncorrectColorHexLengthException
-     * @throws InvalidColorHexValueException
-     *
      * @dataProvider provideColorIncorrectLength
      */
     public function testGetValidColorHexValueUsingIncorrectValueWithoutException($incorrectColor)
@@ -606,10 +586,6 @@ class RegexTest extends BaseTestCase
 
     /**
      * @param string $incorrectColor Incorrect value of color
-     *
-     * @throws IncorrectColorHexLengthException
-     * @throws InvalidColorHexValueException
-     *
      * @dataProvider provideColorIncorrectLength
      */
     public function testGetValidColorHexValueUsingIncorrectValue($incorrectColor)
@@ -620,10 +596,6 @@ class RegexTest extends BaseTestCase
 
     /**
      * @param string $invalidColor Invalid value of color
-     *
-     * @throws IncorrectColorHexLengthException
-     * @throws InvalidColorHexValueException
-     *
      * @dataProvider provideColorInvalidValue
      */
     public function testGetValidColorHexValueUsingInvalidValueWithoutException($invalidColor)
@@ -633,10 +605,6 @@ class RegexTest extends BaseTestCase
 
     /**
      * @param string $invalidColor Invalid value of color
-     *
-     * @throws IncorrectColorHexLengthException
-     * @throws InvalidColorHexValueException
-     *
      * @dataProvider provideColorInvalidValue
      */
     public function testGetValidColorHexValueUsingInvalidValue($invalidColor)
@@ -649,9 +617,6 @@ class RegexTest extends BaseTestCase
      * @param string $color    Color to verify
      * @param string $expected Expected value of color
      *
-     * @throws IncorrectColorHexLengthException
-     * @throws InvalidColorHexValueException
-     *
      * @dataProvider provideColor
      */
     public function testGetValidColorHexValue($color, $expected)
@@ -659,6 +624,17 @@ class RegexTest extends BaseTestCase
         self::assertEquals($expected, Regex::getValidColorHexValue($color));
     }
 
+    /**
+     * @param string $value    Value that should be transformed to slug
+     * @param string $expected Expected slug
+     *
+     * @dataProvider provideValueSlug
+     */
+    public function testCreateSlug($value, $expected)
+    {
+        self::assertSame($expected, Regex::createSlug($value));
+    }
+
     /**
      * Provides name of bundle and information if it's valid name
      *
@@ -834,12 +810,12 @@ class RegexTest extends BaseTestCase
         ];
 
         yield[
-            fread(fopen($file1Path, 'r'), 1),
+            fread(fopen($file1Path, 'rb'), 1),
             false,
         ];
 
         yield[
-            fread(fopen($file2Path, 'r'), 1),
+            fread(fopen($file2Path, 'rb'), 1),
             true,
         ];
     }
@@ -1729,6 +1705,89 @@ class RegexTest extends BaseTestCase
         ];
     }
 
+    /**
+     * Provide value to create slug
+     *
+     * @return Generator
+     */
+    public function provideValueSlug()
+    {
+        yield[
+            [],
+            false,
+        ];
+
+        yield[
+            null,
+            false,
+        ];
+
+        yield[
+            '',
+            '',
+        ];
+
+        yield[
+            1234,
+            '1234',
+        ];
+
+        yield[
+            '1234',
+            '1234',
+        ];
+
+        yield[
+            '1/2/3/4',
+            '1234',
+        ];
+
+        yield[
+            '1 / 2 / 3 / 4',
+            '1-2-3-4',
+        ];
+
+        yield[
+            'test',
+            'test',
+        ];
+
+        yield[
+            'test test',
+            'test-test',
+        ];
+
+        yield[
+            'lorem ipsum dolor sit',
+            'lorem-ipsum-dolor-sit',
+        ];
+
+        yield[
+            'Lorem ipsum. Dolor sit 12.34 amet.',
+            'lorem-ipsum-dolor-sit-1234-amet',
+        ];
+
+        yield[
+            'Was sind Löwen, Bären, Vögel und Käfer (für die Prüfung)?',
+            'was-sind-lowen-baren-vogel-und-kafer-fur-die-prufung',
+        ];
+
+        yield[
+            'äöü (ÄÖÜ)',
+            'aou-aou',
+        ];
+
+        yield[
+            'Półka dębowa. Kolor: żółędziowy. Wymiary: 80 x 30 cm.',
+            'polka-debowa-kolor-zoledziowy-wymiary-80-x-30-cm',
+        ];
+
+        yield[
+            'ąęółńśżźć (ĄĘÓŁŃŚŻŹĆ)',
+            'aeolnszzc-aeolnszzc',
+        ];
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -1737,7 +1796,8 @@ class RegexTest extends BaseTestCase
         parent::setUp();
 
         $this->simpleText = 'lorem ipsum dolor sit';
-        $this->camelCaseText = str_replace(' ', '', lcfirst(ucwords($this->simpleText))); // 'loremIpsumDolorSit'
+        $simpleUppercase = ucwords($this->simpleText);
+        $this->camelCaseText = str_replace(' ', '', lcfirst($simpleUppercase)); // 'loremIpsumDolorSit'
     }
 
     /**
@@ -1746,8 +1806,6 @@ class RegexTest extends BaseTestCase
     protected function tearDown()
     {
         parent::tearDown();
-
-        unset($this->simpleText);
-        unset($this->camelCaseText);
+        unset($this->simpleText, $this->camelCaseText);
     }
 }

tests/ValueObject/AddressTest.php

@@ -0,0 +1,105 @@
+<?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\Test\ValueObject;
+
+use Meritoo\Common\Test\Base\BaseTestCase;
+use Meritoo\Common\Type\OopVisibilityType;
+use Meritoo\Common\ValueObject\Address;
+
+/**
+ * Test case for the address
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+class AddressTest extends BaseTestCase
+{
+    /**
+     * @var Address
+     */
+    private $address;
+
+    /**
+     * @var Address
+     */
+    private $addressWithoutFlat;
+
+    /**
+     * @var Address
+     */
+    private $addressWithoutStreet;
+
+    public function testConstructor()
+    {
+        static::assertConstructorVisibilityAndArguments(
+            Address::class,
+            OopVisibilityType::IS_PUBLIC,
+            5,
+            4
+        );
+    }
+
+    public function testGetFlatNumber()
+    {
+        static::assertSame('200', $this->address->getFlatNumber());
+        static::assertSame('', $this->addressWithoutFlat->getFlatNumber());
+        static::assertSame('300', $this->addressWithoutStreet->getFlatNumber());
+    }
+
+    public function testGetBuildingNumber()
+    {
+        static::assertSame('10', $this->address->getBuildingNumber());
+        static::assertSame('22', $this->addressWithoutFlat->getBuildingNumber());
+        static::assertSame('1', $this->addressWithoutStreet->getBuildingNumber());
+    }
+
+    public function testGetStreet()
+    {
+        static::assertSame('4th Avenue', $this->address->getStreet());
+        static::assertSame('Green Street', $this->addressWithoutFlat->getStreet());
+        static::assertSame('', $this->addressWithoutStreet->getStreet());
+    }
+
+    public function testGetFullStreet()
+    {
+        static::assertSame('4th Avenue 10/200', $this->address->getFullStreet());
+        static::assertSame('Green Street 22', $this->addressWithoutFlat->getFullStreet());
+        static::assertSame('', $this->addressWithoutStreet->getFullStreet());
+    }
+
+    public function testGetCity()
+    {
+        static::assertSame('New York', $this->address->getCity());
+        static::assertSame('San Francisco', $this->addressWithoutFlat->getCity());
+        static::assertSame('Saint Louis', $this->addressWithoutStreet->getCity());
+    }
+
+    public function testGetZipCode()
+    {
+        static::assertSame('00123', $this->address->getZipCode());
+        static::assertSame('00456', $this->addressWithoutFlat->getZipCode());
+        static::assertSame('00111', $this->addressWithoutStreet->getZipCode());
+    }
+
+    public function testToString()
+    {
+        static::assertSame('4th Avenue 10/200, 00123, New York', (string)$this->address);
+        static::assertSame('Green Street 22, 00456, San Francisco', (string)$this->addressWithoutFlat);
+        static::assertSame('00111, Saint Louis', (string)$this->addressWithoutStreet);
+    }
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->address = new Address('New York', '00123', '4th Avenue', '10', '200');
+        $this->addressWithoutFlat = new Address('San Francisco', '00456', 'Green Street', '22');
+        $this->addressWithoutStreet = new Address('Saint Louis', '00111', '', '1', '300');
+    }
+}

tests/ValueObject/BankAccountTest.php

@@ -0,0 +1,71 @@
+<?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\Test\ValueObject;
+
+use Meritoo\Common\Test\Base\BaseTestCase;
+use Meritoo\Common\Type\OopVisibilityType;
+use Meritoo\Common\ValueObject\BankAccount;
+
+/**
+ * Test case for the bank account
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+class BankAccountTest extends BaseTestCase
+{
+    /**
+     * @var BankAccount
+     */
+    private $emptyBankAccount;
+
+    /**
+     * @var BankAccount
+     */
+    private $bankAccount;
+
+    public function testConstructor()
+    {
+        static::assertConstructorVisibilityAndArguments(
+            BankAccount::class,
+            OopVisibilityType::IS_PUBLIC,
+            2,
+            2
+        );
+    }
+
+    public function testGetAccountNumber()
+    {
+        self::assertSame('', $this->emptyBankAccount->getAccountNumber());
+        self::assertSame('1234567890', $this->bankAccount->getAccountNumber());
+    }
+
+    public function testGetBankName()
+    {
+        self::assertSame('', $this->emptyBankAccount->getBankName());
+        self::assertSame('Bank of America', $this->bankAccount->getBankName());
+    }
+
+    public function testToString()
+    {
+        static::assertSame('', (string)$this->emptyBankAccount);
+        static::assertSame('Bank of America, 1234567890', (string)$this->bankAccount);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->emptyBankAccount = new BankAccount('', '');
+        $this->bankAccount = new BankAccount('Bank of America', '1234567890');
+    }
+}

tests/ValueObject/CompanyTest.php

@@ -0,0 +1,98 @@
+<?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\Test\ValueObject;
+
+use Meritoo\Common\Test\Base\BaseTestCase;
+use Meritoo\Common\Type\OopVisibilityType;
+use Meritoo\Common\ValueObject\Address;
+use Meritoo\Common\ValueObject\BankAccount;
+use Meritoo\Common\ValueObject\Company;
+
+/**
+ * Test case for the company
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+class CompanyTest extends BaseTestCase
+{
+    /**
+     * @var Company
+     */
+    private $company;
+
+    /**
+     * @var Company
+     */
+    private $companyWithoutBankAccount;
+
+    public function testConstructor()
+    {
+        static::assertConstructorVisibilityAndArguments(
+            Company::class,
+            OopVisibilityType::IS_PUBLIC,
+            3,
+            2
+        );
+    }
+
+    public function testGetName()
+    {
+        static::assertSame('Test 1', $this->company->getName());
+        static::assertSame('Test 2', $this->companyWithoutBankAccount->getName());
+    }
+
+    public function testGetAddress()
+    {
+        static::assertEquals(
+            new Address('New York', '00123', '4th Avenue', '10', '200'),
+            $this->company->getAddress()
+        );
+
+        static::assertEquals(
+            new Address('San Francisco', '00456', 'Green Street', '22'),
+            $this->companyWithoutBankAccount->getAddress()
+        );
+    }
+
+    public function testGetBankAccount()
+    {
+        static::assertEquals(
+            new BankAccount('Bank 1', '12345'),
+            $this->company->getBankAccount()
+        );
+
+        static::assertNull($this->companyWithoutBankAccount->getBankAccount());
+    }
+
+    public function testToString()
+    {
+        static::assertSame('Test 1, 4th Avenue 10/200, 00123, New York, Bank 1, 12345', (string)$this->company);
+        static::assertSame('Test 2, Green Street 22, 00456, San Francisco', (string)$this->companyWithoutBankAccount);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->company = new Company(
+            'Test 1',
+            new Address('New York', '00123', '4th Avenue', '10', '200'),
+            new BankAccount('Bank 1', '12345')
+        );
+
+        $this->companyWithoutBankAccount = new Company(
+            'Test 2',
+            new Address('San Francisco', '00456', 'Green Street', '22')
+        );
+    }
+}

tests/ValueObject/VersionTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Test\Common\ValueObject;
+namespace Meritoo\Common\Test\ValueObject;
 
 use Generator;
 use Meritoo\Common\Test\Base\BaseTestCase;