Fix coding standard (minor fix)

Related to update versions of the "dev" packages

.styleci.yml

@@ -0,0 +1,8 @@
+preset: symfony
+
+disabled:
+    - phpdoc_annotation_without_dot
+    - cast_spaces
+    - concat_without_spaces
+    - blank_line_before_return
+    - trim_array_spaces

.travis.yml

@@ -0,0 +1,12 @@
+language: php
+
+php:
+  - 5.6
+  - 7.0
+  - 7.1
+
+install:
+  - composer install
+
+script:
+  - php ./vendor/bin/phpunit

README.md

@@ -1,9 +1,11 @@
 # Meritoo Common Library
-Useful classes, methods, extensions etc.
+Common and useful classes, methods, exceptions etc.
+
+[![Travis](https://img.shields.io/travis/rust-lang/rust.svg?style=flat-square)](https://travis-ci.org/meritoo/common-library) [![Packagist](https://img.shields.io/packagist/v/meritoo/common-library.svg?style=flat-square)](https://packagist.org/packages/meritoo/common-library) [![StyleCI](https://styleci.io/repos/101790028/shield?branch=master)](https://styleci.io/repos/101790028) [![license](https://img.shields.io/github/license/meritoo/common-library.svg?style=flat-square)](https://github.com/meritoo/common-library) [![GitHub commits](https://img.shields.io/github/commits-since/meritoo/common-library/0.0.1.svg?style=flat-square)](https://github.com/meritoo/common-library) [![Coverage Status](https://coveralls.io/repos/github/meritoo/common-library/badge.svg?branch=master)](https://coveralls.io/github/meritoo/common-library?branch=master)
 
 ## Installation
 
-Run [Composer](https://getcomposer.org) to install new package:
+Run [Composer](https://getcomposer.org) to install this package in your project:
 
     ```bash
     $ composer require meritoo/common-library
@@ -11,15 +13,93 @@ Run [Composer](https://getcomposer.org) to install new package:
 
 > How to install Composer: https://getcomposer.org/download
 
-## Usage
+## Static methods
 
-This package contains a lot of static methods, so usage is not so complicated. Just run the static method who would you like to use. Example:
+This package contains a lot of class with static methods, so usage is not so complicated. Just run the static method who would you like to use. Example:
 
 ```php
 use Meritoo\Common\Utilities\Arrays;
 
-$firstElement = Arrays::getFirstElement(['lorem' 'ipsum']);
+$firstElement = Arrays::getFirstElement(['lorem', 'ipsum']);
-// result: "lorem"
+var_dump($firstElement); // string(5) "lorem"
+```
+
+## Base test case with common methods and data providers
+
+Located here: `Meritoo\Common\Test\Base\BaseTestCase`. Just extend the `BaseTestCase` class and use it like in `Meritoo\Common\Test\Utilities\DateTest` class:
+
+```php
+class DateTest extends BaseTestCase
+{
+    /**
+     * @param mixed $value Empty value, e.g. ""
+     * @dataProvider provideEmptyValue
+     */
+    public function testGetDateTimeEmptyValue($value)
+    {
+        self::assertFalse(Date::getDateTime($value));
+    }
+
+	(...)
+}
+```
+
+or in `Meritoo\Common\Test\Utilities\MimeTypesTest` class:
+
+```php
+class MimeTypesTest extends BaseTestCase
+{
+	(...)
+
+    /**
+     * @param bool $mimeType The mime type, e.g. "video/mpeg"
+     * @dataProvider provideBooleanValue
+     */
+    public function testGetExtensionBooleanMimeType($mimeType)
+    {
+        self::assertEquals('', MimeTypes::getExtension($mimeType));
+    }
+
+	(...)
+}
+```
+
+## Collection of elements
+
+Located here: `Meritoo\Common\Collection\Collection`. It's a set of some elements, e.g. objects. It's iterable and countable. Provides very useful methods. Some of them:
+- `getFirst()` - returns the first element in the collection
+- `getLast()` - returns the last element in the collection
+- `isEmpty()` - returns information if collection is empty
+- `add($element, $index = null)` - adds given element (at the end of collection)
+- `addMultiple($elements, $useIndexes = false)` - adds given elements (at the end of collection)
+- `prepend($element)` - prepends given element (adds given element at the beginning of collection)
+- `remove($element)` - removes given element
+
+Examples of usage below.
+
+#### An empty collection
+
+```php
+use Meritoo\Common\Collection\Collection;
+
+$emptyCollection = new Collection();
+var_dump($emptyCollection->isEmpty()); // bool(true)
+```
+
+#### Simple collection
+
+```php
+use Meritoo\Common\Collection\Collection;
+
+$elements = [
+    'lorem',
+    'ipsum',
+    123 => 'dolor',
+    345 => 'sit',
+];
+
+$simpleCollection = new Collection($elements);
+var_dump($simpleCollection->has('dolor')); // bool(true)
 ```
 
 Enjoy!

composer.json

@@ -2,7 +2,7 @@
     "name": "meritoo/common-library",
     "description": "Useful classes, methods, extensions etc.",
     "license": "MIT",
-    "version": "0.0.4",
+    "version": "0.0.8",
     "authors": [
         {
             "name": "Meritoo.pl",
@@ -17,18 +17,18 @@
         "symfony/http-foundation": "^3.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8 || ^5.0",
+        "phpunit/phpunit": "^5.7",
-        "squizlabs/php_codesniffer": "^2.8",
+        "squizlabs/php_codesniffer": "^2.9",
         "phpmd/phpmd": "^2.6",
         "sebastian/phpcpd": "^3.0",
         "pdepend/pdepend": "^2.5",
-        "phploc/phploc": "^3.0",
+        "phploc/phploc": "^4.0",
-        "friendsofphp/php-cs-fixer": "^2.1"
+        "friendsofphp/php-cs-fixer": "^2.6"
     },
     "autoload": {
         "psr-4": {
             "Meritoo\\Common\\": "src/Meritoo/Common/",
-            "Meritoo\\Common\\Tests\\": "tests/Meritoo/Common/Tests/"
+            "Meritoo\\Common\\Test\\": "tests/Meritoo/Common/Test/"
         }
     }
 }

phpunit.xml.dist

@@ -12,7 +12,7 @@
          bootstrap="./vendor/autoload.php"
 >
     <testsuites>
-        <testsuite name="Meritoo's Common Library Test Suite">
+        <testsuite name="Meritoo Package - Main Test Suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>

src/Meritoo/Common/Collection/Collection.php

@@ -109,7 +109,7 @@ class Collection implements Countable, ArrayAccess, IteratorAggregate
      */
     public function add($element, $index = null)
     {
-        if ($index === null) {
+        if (null === $index) {
             $this->elements[] = $element;
         } else {
             $this->elements[$index] = $element;
@@ -216,7 +216,7 @@ class Collection implements Countable, ArrayAccess, IteratorAggregate
     {
         $index = Arrays::getIndexOf($this->elements, $element);
 
-        return $index !== null && $index !== false;
+        return null !== $index && false !== $index;
     }
 
     /**

src/Meritoo/Common/Test/Base/BaseTestCase.php

@@ -6,23 +6,23 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Utilities;
+namespace Meritoo\Common\Test\Base;
 
 use DateTime;
 use Generator;
 use Meritoo\Common\Exception\Type\UnknownOopVisibilityTypeException;
 use Meritoo\Common\Type\OopVisibilityType;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 use ReflectionMethod;
 
 /**
- * Test case with common methods and data providers
+ * Base test case with common methods and data providers
  *
  * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
  * @copyright Meritoo.pl
  */
-class TestCase extends PHPUnit_Framework_TestCase
+abstract class BaseTestCase extends TestCase
 {
     /**
      * Provides an empty value
@@ -92,7 +92,7 @@ class TestCase extends PHPUnit_Framework_TestCase
     {
         yield['lets-test.doc'];
         yield['lorem/ipsum.jpg'];
-        yield['suprise/me/one/more/time.txt'];
+        yield['surprise/me/one/more/time.txt'];
     }
 
     /**
@@ -109,7 +109,7 @@ class TestCase extends PHPUnit_Framework_TestCase
             $directoryPath = '/' . $directoryPath;
         }
 
-        return sprintf('%s/../../../../data/tests/%s%s', __DIR__, $fileName, $directoryPath);
+        return sprintf('%s/../../../../../data/tests/%s%s', __DIR__, $fileName, $directoryPath);
     }
 
     /**

src/Meritoo/Common/Test/Base/BaseTypeTestCase.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Meritoo\Common\Test\Base;
+
+use Generator;
+use Meritoo\Common\Type\Base\BaseType;
+
+/**
+ * Base test case for the type of something
+ *
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
+ */
+abstract class BaseTypeTestCase extends BaseTestCase
+{
+    /**
+     * Verifies availability of all types
+     */
+    public function testAvailabilityOfAllTypes()
+    {
+        $available = $this->getTestedTypeInstance()->getAll();
+        $all = $this->getAllExpectedTypes();
+
+        static::assertEquals($all, $available);
+    }
+
+    /**
+     * Verifies whether given type is correct or not
+     *
+     * @param string $type     Type to verify
+     * @param bool   $expected Information if given type is correct or not
+     *
+     * @dataProvider provideTypeToVerify
+     */
+    public function testIfGivenTypeIsCorrect($type, $expected)
+    {
+        static::assertEquals($expected, $this->getTestedTypeInstance()->isCorrectType($type));
+    }
+
+    /**
+     * Provides type to verify and information if it's correct
+     *
+     * @return Generator
+     */
+    abstract public function provideTypeToVerify();
+
+    /**
+     * Returns instance of the tested type
+     *
+     * @return BaseType
+     */
+    abstract protected function getTestedTypeInstance();
+
+    /**
+     * Returns all expected types of the tested type
+     *
+     * @return array
+     */
+    abstract protected function getAllExpectedTypes();
+}

src/Meritoo/Common/Type/Base/BaseType.php

@@ -33,7 +33,7 @@ abstract class BaseType
      */
     public function getAll()
     {
-        if ($this->all === null) {
+        if (null === $this->all) {
             $this->all = Reflection::getConstants($this);
         }
 

src/Meritoo/Common/Utilities/Arrays.php

@@ -415,7 +415,7 @@ class Arrays
                      * var autoGeneratedVariable = new Array(...);autoGeneratedVariable[0] = new Array(...);
                      * autoGeneratedVariable[1] = new Array(...);
                      */
-                    if ($counter === 1) {
+                    if (1 === $counter) {
                         $effect .= "\n";
                     }
 
@@ -758,7 +758,7 @@ class Arrays
         foreach ($exploded as $item) {
             $exploded2 = explode($valuesKeysSeparator, $item);
 
-            if (count($exploded2) == 2) {
+            if (2 == count($exploded2)) {
                 $key = trim($exploded2[0]);
                 $value = trim($exploded2[1]);
 
@@ -1124,7 +1124,7 @@ class Arrays
         if (!empty($array)) {
             $childPosition = 1;
 
-            if ($startPosition !== null) {
+            if (null !== $startPosition) {
                 $array[$keyName] = $startPosition;
             }
 
@@ -1316,7 +1316,7 @@ class Arrays
              *
              * If one of the above is true, not all elements of given array are empty
              */
-            if ((!is_array($element) && $strictNull && $element !== null) || !empty($element)) {
+            if ((!is_array($element) && $strictNull && null !== $element) || !empty($element)) {
                 return false;
             }
         }
@@ -1353,7 +1353,7 @@ class Arrays
          * Values should be compared only and both arrays are one-dimensional?
          * Let's find difference by using simple function
          */
-        if ($valuesOnly && self::getDimensionsCount($array1) == 1 && self::getDimensionsCount($array2) == 1) {
+        if ($valuesOnly && 1 == self::getDimensionsCount($array1) && 1 == self::getDimensionsCount($array2)) {
             return array_diff($array1, $array2);
         }
 
@@ -1381,7 +1381,7 @@ class Arrays
                     }
                 }
 
-                if ($difference !== null) {
+                if (null !== $difference) {
                     $effect[] = $difference;
                 }
             } else {
@@ -1472,7 +1472,7 @@ class Arrays
              * Start index not provided?
              * Let's look for the first index / key of given array
              */
-            if ($startIndex === null) {
+            if (null === $startIndex) {
                 $startIndex = self::getFirstKey($array);
             }
 
@@ -1617,7 +1617,7 @@ class Arrays
          * Index of element or of element's key is unknown?
          * Probably the element does not exist in given array, so... nothing to do
          */
-        if ($elementKey === null || $indexOfKey === null) {
+        if (null === $elementKey || null === $indexOfKey) {
             return null;
         }
 

src/Meritoo/Common/Utilities/Composer.php

@@ -59,7 +59,7 @@ class Composer
          * Unknown data from the composer.json file or there is no node with given name?
          * Nothing to do
          */
-        if ($data === null || !isset($data->{$nodeName})) {
+        if (null === $data || !isset($data->{$nodeName})) {
             return null;
         }
 

src/Meritoo/Common/Utilities/Date.php

@@ -129,10 +129,10 @@ class Date
                     $dateStart = new DateTime();
                     $dateEnd = new DateTime();
 
-                    if ($period == DatePeriod::LAST_YEAR || $period == DatePeriod::NEXT_YEAR) {
+                    if (DatePeriod::LAST_YEAR == $period || DatePeriod::NEXT_YEAR == $period) {
                         $yearDifference = 1;
 
-                        if ($period == DatePeriod::LAST_YEAR) {
+                        if (DatePeriod::LAST_YEAR == $period) {
                             $yearDifference *= -1;
                         }
 
@@ -148,7 +148,7 @@ class Date
                     break;
             }
 
-            if ($dateStart !== null && $dateEnd !== null) {
+            if (null !== $dateStart && null !== $dateEnd) {
                 $dateStart->setTime(0, 0, 0);
                 $dateEnd->setTime(23, 59, 59);
 
@@ -311,7 +311,7 @@ class Date
 
         $encoding = mb_detect_encoding($name);
 
-        if ($encoding === false) {
+        if (false === $encoding) {
             $name = mb_convert_encoding($name, 'UTF-8', 'ISO-8859-2');
         }
 
@@ -378,46 +378,46 @@ class Date
             self::DATE_DIFFERENCE_UNIT_MINUTES,
         ];
 
-        if ($differenceUnit === null || $differenceUnit == self::DATE_DIFFERENCE_UNIT_YEARS) {
+        if (null === $differenceUnit || self::DATE_DIFFERENCE_UNIT_YEARS == $differenceUnit) {
             $diff = $dateEnd->diff($dateStart);
 
             /*
              * Difference between dates in years should be returned only?
              */
-            if ($differenceUnit == self::DATE_DIFFERENCE_UNIT_YEARS) {
+            if (self::DATE_DIFFERENCE_UNIT_YEARS == $differenceUnit) {
                 return $diff->y;
             }
 
             $difference[self::DATE_DIFFERENCE_UNIT_YEARS] = $diff->y;
         }
 
-        if ($differenceUnit === null || $differenceUnit == self::DATE_DIFFERENCE_UNIT_MONTHS) {
+        if (null === $differenceUnit || self::DATE_DIFFERENCE_UNIT_MONTHS == $differenceUnit) {
             $diff = $dateEnd->diff($dateStart);
 
             /*
              * Difference between dates in months should be returned only?
              */
-            if ($differenceUnit == self::DATE_DIFFERENCE_UNIT_MONTHS) {
+            if (self::DATE_DIFFERENCE_UNIT_MONTHS == $differenceUnit) {
                 return $diff->m;
             }
 
             $difference[self::DATE_DIFFERENCE_UNIT_MONTHS] = $diff->m;
         }
 
-        if ($differenceUnit === null || in_array($differenceUnit, $relatedUnits)) {
+        if (null === $differenceUnit || in_array($differenceUnit, $relatedUnits)) {
             $days = (int)floor($dateDiff / $daySeconds);
 
             /*
              * Difference between dates in days should be returned only?
              */
-            if ($differenceUnit == self::DATE_DIFFERENCE_UNIT_DAYS) {
+            if (self::DATE_DIFFERENCE_UNIT_DAYS == $differenceUnit) {
                 return $days;
             }
 
             /*
              * All units should be returned?
              */
-            if ($differenceUnit === null) {
+            if (null === $differenceUnit) {
                 $difference[self::DATE_DIFFERENCE_UNIT_DAYS] = $days;
             }
 
@@ -427,20 +427,20 @@ class Date
             $daysInSeconds = $days * $daySeconds;
         }
 
-        if ($differenceUnit === null || in_array($differenceUnit, $relatedUnits)) {
+        if (null === $differenceUnit || in_array($differenceUnit, $relatedUnits)) {
             $hours = (int)floor(($dateDiff - $daysInSeconds) / $hourSeconds);
 
             /*
              * Difference between dates in hours should be returned only?
              */
-            if ($differenceUnit == self::DATE_DIFFERENCE_UNIT_HOURS) {
+            if (self::DATE_DIFFERENCE_UNIT_HOURS == $differenceUnit) {
                 return $hours;
             }
 
             /*
              * All units should be returned?
              */
-            if ($differenceUnit === null) {
+            if (null === $differenceUnit) {
                 $difference[self::DATE_DIFFERENCE_UNIT_HOURS] = $hours;
             }
 
@@ -450,13 +450,13 @@ class Date
             $hoursInSeconds = $hours * $hourSeconds;
         }
 
-        if ($differenceUnit === null || $differenceUnit == self::DATE_DIFFERENCE_UNIT_MINUTES) {
+        if (null === $differenceUnit || self::DATE_DIFFERENCE_UNIT_MINUTES == $differenceUnit) {
             $minutes = (int)floor(($dateDiff - $daysInSeconds - $hoursInSeconds) / 60);
 
             /*
              * Difference between dates in minutes should be returned only?
              */
-            if ($differenceUnit == self::DATE_DIFFERENCE_UNIT_MINUTES) {
+            if (self::DATE_DIFFERENCE_UNIT_MINUTES == $differenceUnit) {
                 return $minutes;
             }
 
@@ -524,7 +524,7 @@ class Date
      */
     public static function getRandomDate(DateTime $startDate = null, $start = 1, $end = 100, $intervalTemplate = 'P%sD')
     {
-        if ($startDate === null) {
+        if (null === $startDate) {
             $startDate = new DateTime();
         }
 
@@ -590,7 +590,7 @@ class Date
                  */
                 $dateFromFormat = DateTime::createFromFormat($dateFormat, $value);
 
-                if ($dateFromFormat === false) {
+                if (false === $dateFromFormat) {
                     /*
                      * Nothing to do more, because:
                      * a) instance of the DateTime was created

src/Meritoo/Common/Utilities/DatePeriod.php

@@ -140,7 +140,7 @@ class DatePeriod
         /*
          * Unknown date or format is invalid?
          */
-        if ($date === null || !Date::isValidDateFormat($format)) {
+        if (null === $date || !Date::isValidDateFormat($format)) {
             return '';
         }
 

src/Meritoo/Common/Utilities/Miscellaneous.php

@@ -65,7 +65,7 @@ class Miscellaneous
 
         if (!empty($directoryContent)) {
             foreach ($directoryContent as $fileName) {
-                if ($fileName != '.' && $fileName != '..') {
+                if ('.' != $fileName && '..' != $fileName) {
                     $content = null;
 
                     if (!empty($startFileName) && !$startFileFound) {
@@ -80,7 +80,7 @@ class Miscellaneous
                         $content = self::getDirectoryContent($directoryPath . $fileName, true, $maxFilesCount - $count);
                     }
 
-                    if ($content !== null) {
+                    if (null !== $content) {
                         $files[$fileName] = $content;
 
                         if (!empty($maxFilesCount)) {
@@ -365,7 +365,7 @@ class Miscellaneous
          * Oops, cannot instantiate converter
          * Nothing to do
          */
-        if ($converter === null) {
+        if (null === $converter) {
             return '';
         }
 
@@ -460,7 +460,7 @@ class Miscellaneous
          * Value to find is neither a string nor an array OR it's an empty string?
          * Nothing to do
          */
-        if ((!$searchIsString && !$searchIsArray) || ($searchIsString && strlen($search) == 0)) {
+        if ((!$searchIsString && !$searchIsArray) || ($searchIsString && 0 == strlen($search))) {
             return $effect;
         }
 
@@ -612,7 +612,7 @@ class Miscellaneous
             $effect = mb_substr($text, 0, $maxLength, 'utf-8');
             $lastSpacePosition = mb_strrpos($effect, ' ', 'utf-8');
 
-            if ($lastSpacePosition !== false) {
+            if (false !== $lastSpacePosition) {
                 $effect = mb_substr($effect, 0, $lastSpacePosition, 'utf-8');
             }
 
@@ -730,7 +730,7 @@ class Miscellaneous
         }
 
         foreach (scandir($directoryPath) as $item) {
-            if ($item == '.' || $item == '..') {
+            if ('.' == $item || '..' == $item) {
                 continue;
             }
 
@@ -776,7 +776,7 @@ class Miscellaneous
         foreach ($members as $key => $value) {
             $value = mb_strtolower($value);
 
-            if ($key == 0) {
+            if (0 == $key) {
                 $effect .= self::lowercaseFirst($value);
             } else {
                 $effect .= self::uppercaseFirst($value);
@@ -812,7 +812,7 @@ class Miscellaneous
 
         if ($restLowercase) {
             $effect = mb_strtolower($effect);
-        } elseif ($restLowercase === false) {
+        } elseif (false === $restLowercase) {
             $effect = mb_strtoupper($effect);
         }
 
@@ -850,7 +850,7 @@ class Miscellaneous
 
         if ($restLowercase) {
             $effect = mb_strtolower($effect);
-        } elseif ($restLowercase === false) {
+        } elseif (false === $restLowercase) {
             $effect = mb_strtoupper($effect);
         }
 
@@ -1153,7 +1153,7 @@ class Miscellaneous
     {
         $value = filter_input($globalSourceType, $variableName);
 
-        if ($value === null) {
+        if (null === $value) {
             $globalSource = null;
 
             switch ($globalSourceType) {
@@ -1178,7 +1178,7 @@ class Miscellaneous
                     break;
             }
 
-            if ($globalSource !== null && isset($globalSource[$variableName])) {
+            if (null !== $globalSource && isset($globalSource[$variableName])) {
                 $value = $globalSource[$variableName];
 
                 if (!ini_get('magic_quotes_gpc')) {
@@ -1232,7 +1232,7 @@ class Miscellaneous
             /*
              * First line is only HTTP status and is unneeded so skip it
              */
-            if ($i === 0) {
+            if (0 === $i) {
                 continue;
             }
 
@@ -1242,7 +1242,7 @@ class Miscellaneous
                 /*
                  * If the header is a "set-cookie" let's save it to "cookies" array
                  */
-                if ($key === 'Set-Cookie') {
+                if ('Set-Cookie' === $key) {
                     $cookieParameters = explode(';', $value);
 
                     $name = '';
@@ -1260,7 +1260,7 @@ class Miscellaneous
                          * First parameter will be always a cookie name and it's value. It is not needed to run
                          * further actions for them, so save the values and move to next parameter.
                          */
-                        if ($j === 0) {
+                        if (0 === $j) {
                             $name = trim($param[0]);
                             $value = trim($param[1]);
                             continue;
@@ -1416,7 +1416,7 @@ class Miscellaneous
         if ($asHexadecimal) {
             $hexadecimal = dechex($colorComponent);
 
-            if (strlen($hexadecimal) == 1) {
+            if (1 == strlen($hexadecimal)) {
                 return sprintf('0%s', $hexadecimal, $hexadecimal);
             }
 

src/Meritoo/Common/Utilities/QueryBuilderUtility.php

@@ -108,7 +108,7 @@ class QueryBuilderUtility
                 $compareOperator = '=';
 
                 if (is_array($value) && !empty($value)) {
-                    if (count($value) == 2) {
+                    if (2 == count($value)) {
                         $compareOperator = $value[1];
                     }
 
@@ -117,7 +117,7 @@ class QueryBuilderUtility
 
                 $predicate = sprintf('%s.%s %s :%s', $alias, $column, $compareOperator, $column);
 
-                if ($value === null) {
+                if (null === $value) {
                     $predicate = $queryBuilder->expr()->isNull(sprintf('%s.%s', $alias, $column));
                     unset($criteria[$column]);
                 } else {

src/Meritoo/Common/Utilities/Reflection.php

@@ -201,7 +201,7 @@ class Reflection
              * Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
              * 2016-11-07
              */
-            if ($object !== null) {
+            if (null !== $object) {
                 unset($exploded[0]);
 
                 $property = implode('.', $exploded);
@@ -246,7 +246,7 @@ class Reflection
                     }
                 }
 
-                if (!$valueFound && $reflectionProperty !== null) {
+                if (!$valueFound && null !== $reflectionProperty) {
                     /*
                      * Oops, we have got exception.
                      *
@@ -285,7 +285,7 @@ class Reflection
         foreach ($objects as $entity) {
             $value = self::getPropertyValue($entity, $property, $force);
 
-            if ($value !== null) {
+            if (null !== $value) {
                 $values[] = $value;
             }
         }
@@ -345,7 +345,7 @@ class Reflection
         if ($withoutNamespace) {
             $classOnly = Miscellaneous::getLastElementOfString($name, '\\');
 
-            if ($classOnly !== null) {
+            if (null !== $classOnly) {
                 $name = $classOnly;
             }
 
@@ -427,7 +427,7 @@ class Reflection
         $className = self::getClassName($source);
         $reflection = new ReflectionClass($className);
 
-        if ($filter === null) {
+        if (null === $filter) {
             $filter = ReflectionProperty::IS_PRIVATE
                 + ReflectionProperty::IS_PROTECTED
                 + ReflectionProperty::IS_PUBLIC
@@ -477,7 +477,7 @@ class Reflection
         /*
          * Oops, cannot resolve class
          */
-        if ($className === null) {
+        if (null === $className) {
             throw new CannotResolveClassNameException($class);
         }
 
@@ -603,7 +603,7 @@ class Reflection
         if (!$uses && $verifyParents) {
             $parentClassName = self::getParentClassName($className);
 
-            if ($parentClassName !== null) {
+            if (null !== $parentClassName) {
                 return self::usesTrait($parentClassName, $trait, true);
             }
         }
@@ -624,7 +624,7 @@ class Reflection
         $reflection = new ReflectionClass($className);
         $parentClass = $reflection->getParentClass();
 
-        if ($parentClass === null || $parentClass === false) {
+        if (null === $parentClass || false === $parentClass) {
             return null;
         }
 

src/Meritoo/Common/Utilities/Regex.php

@@ -84,7 +84,7 @@ class Regex
             $taxid = preg_replace('/[\s-]/', '', $taxidString);
             $sum = 0;
 
-            if (strlen($taxid) == 10 && is_numeric($taxid)) {
+            if (10 == strlen($taxid) && is_numeric($taxid)) {
                 for ($x = 0; $x <= 8; ++$x) {
                     $sum += $taxid[$x] * $weights[$x];
                 }
@@ -185,9 +185,9 @@ class Regex
                         $pattern = '|' . $filterExpression . '|';
                         $matchesCount = preg_match($pattern, $value, $matches);
 
-                        $remove = $matchesCount == 0;
+                        $remove = 0 == $matchesCount;
                     } else {
-                        if ($value == '') {
+                        if ('' == $value) {
                             $value = '\'\'';
                         } elseif (is_string($value)) {
                             $value = '\'' . $value . '\'';
@@ -431,7 +431,7 @@ class Regex
     public static function startsWith($string, $beginning)
     {
         if (!empty($string) && !empty($beginning)) {
-            if (strlen($beginning) == 1 && !self::isLetterOrDigit($beginning)) {
+            if (1 == strlen($beginning) && !self::isLetterOrDigit($beginning)) {
                 $beginning = '\\' . $beginning;
             }
 
@@ -452,7 +452,7 @@ class Regex
      */
     public static function endsWith($string, $ending)
     {
-        if (strlen($ending) == 1 && !self::isLetterOrDigit($ending)) {
+        if (1 == strlen($ending) && !self::isLetterOrDigit($ending)) {
             $ending = '\\' . $ending;
         }
 
@@ -537,7 +537,7 @@ class Regex
      */
     public static function contains($haystack, $needle)
     {
-        if (strlen($needle) == 1 && !self::isLetterOrDigit($needle)) {
+        if (1 == strlen($needle) && !self::isLetterOrDigit($needle)) {
             $needle = '\\' . $needle;
         }
 
@@ -653,7 +653,7 @@ class Regex
         }
 
         $modulo = $sum % 11;
-        $numberControl = ($modulo == 10) ? 0 : $modulo;
+        $numberControl = (10 == $modulo) ? 0 : $modulo;
 
         return $numberControl == $nip[9];
     }
@@ -698,10 +698,10 @@ class Regex
         $color = Miscellaneous::replace($color, '/#/', '');
         $length = strlen($color);
 
-        if ($length === 3) {
+        if (3 === $length) {
             $color = Miscellaneous::replace($color, '/(.)(.)(.)/', '$1$1$2$2$3$3');
         } else {
-            if ($length !== 6) {
+            if (6 !== $length) {
                 if ($throwException) {
                     throw new IncorrectColorHexLengthException($color);
                 }

src/Meritoo/Common/Utilities/Repository.php

@@ -31,14 +31,14 @@ class Repository
     {
         $position = self::getExtremePosition($items, $asLast);
 
-        if ($position === null && $force) {
+        if (null === $position && $force) {
             $position = 0;
         }
 
-        if ($position !== null && !empty($items)) {
+        if (null !== $position && !empty($items)) {
             foreach ($items as $item) {
                 if (method_exists($item, 'getPosition')) {
-                    if ($item->getPosition() === null) {
+                    if (null === $item->getPosition()) {
                         if ($asLast) {
                             ++$position;
                         } else {

src/Meritoo/Common/Utilities/Xml.php

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

tests/Meritoo/Common/Test/Collection/CollectionTest.php

@@ -6,12 +6,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Collection;
+namespace Meritoo\Common\Test\Collection;
 
 use ArrayIterator;
 use Meritoo\Common\Collection\Collection;
+use Meritoo\Common\Test\Base\BaseTestCase;
 use Meritoo\Common\Type\OopVisibilityType;
-use Meritoo\Common\Utilities\TestCase;
 
 /**
  * Tests of the collection of elements
@@ -19,7 +19,7 @@ use Meritoo\Common\Utilities\TestCase;
  * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
  * @copyright Meritoo.pl
  */
-class CollectionTest extends TestCase
+class CollectionTest extends BaseTestCase
 {
     /**
      * An empty collection

tests/Meritoo/Common/Test/Exception/Base/UnknownTypeExceptionTest.php

@@ -6,11 +6,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Exception\Base;
+namespace Meritoo\Common\Test\Exception\Base;
 
 use Meritoo\Common\Exception\Base\UnknownTypeException;
 use Meritoo\Common\Type\Base\BaseType;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests of the exception used while type of something is unknown
@@ -18,7 +18,7 @@ use PHPUnit_Framework_TestCase;
  * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
  * @copyright Meritoo.pl
  */
-class UnknownTypeExceptionTest extends PHPUnit_Framework_TestCase
+class UnknownTypeExceptionTest extends TestCase
 {
     public function testWithoutException()
     {

tests/Meritoo/Common/Test/Type/Base/BaseTypeTest.php

@@ -6,11 +6,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Type\Base;
+namespace Meritoo\Common\Test\Type\Base;
 
 use Generator;
 use Meritoo\Common\Type\Base\BaseType;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests of the base / abstract type of something
@@ -18,7 +18,7 @@ use PHPUnit_Framework_TestCase;
  * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
  * @copyright Meritoo.pl
  */
-class BaseTypeTest extends PHPUnit_Framework_TestCase
+class BaseTypeTest extends TestCase
 {
     /**
      * @param BaseType $type          Type of something

tests/Meritoo/Common/Test/Type/DatePartTypeTest.php

@@ -6,11 +6,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Type;
+namespace Meritoo\Common\Test\Type;
 
-use Generator;
+use Meritoo\Common\Test\Base\BaseTypeTestCase;
 use Meritoo\Common\Type\DatePartType;
-use PHPUnit_Framework_TestCase;
 
 /**
  * Tests of the type of date part, e.g. "year"
@@ -18,11 +17,14 @@ use PHPUnit_Framework_TestCase;
  * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
  * @copyright Meritoo.pl
  */
-class DatePartTypeTest extends PHPUnit_Framework_TestCase
+class DatePartTypeTest extends BaseTypeTestCase
 {
-    public function testGetAll()
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAllExpectedTypes()
     {
-        $expectedTypes = [
+        return [
             'DAY'    => DatePartType::DAY,
             'HOUR'   => DatePartType::HOUR,
             'MINUTE' => DatePartType::MINUTE,
@@ -30,29 +32,20 @@ class DatePartTypeTest extends PHPUnit_Framework_TestCase
             'SECOND' => DatePartType::SECOND,
             'YEAR'   => DatePartType::YEAR,
         ];
-
-        $all = (new DatePartType())->getAll();
-        self::assertEquals($expectedTypes, $all);
     }
 
     /**
-     * @param string $toVerifyType Concrete type to verify (of given instance of type)
+     * {@inheritdoc}
-     * @param bool   $isCorrect    Expected information if given type is correct
-     *
-     * @dataProvider provideConcreteType
      */
-    public function testIsCorrectType($toVerifyType, $isCorrect)
+    protected function getTestedTypeInstance()
     {
-        $type = new DatePartType();
+        return new DatePartType();
-        self::assertEquals($isCorrect, $type->isCorrectType($toVerifyType));
     }
 
     /**
-     * Provides type of something for testing the isCorrectType() method
+     * {@inheritdoc}
-     *
-     * @return Generator
      */
-    public function provideConcreteType()
+    public function provideTypeToVerify()
     {
         yield[
             '',

tests/Meritoo/Common/Test/Utilities/ArraysTest.php

@@ -6,10 +6,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Utilities;
+namespace Meritoo\Common\Test\Utilities;
 
 use Meritoo\Common\Utilities\Arrays;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests of the useful arrays methods
@@ -17,7 +17,7 @@ use PHPUnit_Framework_TestCase;
  * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
  * @copyright Meritoo.pl
  */
-class ArraysTest extends PHPUnit_Framework_TestCase
+class ArraysTest extends TestCase
 {
     private $simpleArray;
     private $simpleArrayWithKeys;

tests/Meritoo/Common/Test/Utilities/BundleTest.php

@@ -6,10 +6,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Utilities;
+namespace Meritoo\Common\Test\Utilities;
 
 use Meritoo\Common\Utilities\Bundle;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests of the useful methods for bundle
@@ -17,7 +17,7 @@ use PHPUnit_Framework_TestCase;
  * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
  * @copyright Meritoo.pl
  */
-class BundleTest extends PHPUnit_Framework_TestCase
+class BundleTest extends TestCase
 {
     public function testGetBundleViewPathEmptyPathAndBundle()
     {

tests/Meritoo/Common/Test/Utilities/ComposerTest.php

@@ -6,10 +6,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Utilities;
+namespace Meritoo\Common\Test\Utilities;
 
+use Generator;
+use Meritoo\Common\Test\Base\BaseTestCase;
 use Meritoo\Common\Utilities\Composer;
-use Meritoo\Common\Utilities\TestCase;
 
 /**
  * Tests of the useful Composer-related methods
@@ -17,7 +18,7 @@ use Meritoo\Common\Utilities\TestCase;
  * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
  * @copyright Meritoo.pl
  */
-class ComposerTest extends TestCase
+class ComposerTest extends BaseTestCase
 {
     /**
      * Path of existing composer.json used as source of data for tests
@@ -60,7 +61,7 @@ class ComposerTest extends TestCase
     /**
      * Provides names and values of existing nodes
      *
-     * @return \Generator
+     * @return Generator
      */
     public function getExistingNode()
     {

tests/Meritoo/Common/Test/Utilities/DatePeriodTest.php

@@ -6,13 +6,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Utilities;
+namespace Meritoo\Common\Test\Utilities;
 
 use DateTime;
 use Generator;
+use Meritoo\Common\Test\Base\BaseTestCase;
 use Meritoo\Common\Type\OopVisibilityType;
 use Meritoo\Common\Utilities\DatePeriod;
-use Meritoo\Common\Utilities\TestCase;
 
 /**
  * Tests of date's period
@@ -20,7 +20,7 @@ use Meritoo\Common\Utilities\TestCase;
  * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
  * @copyright Meritoo.pl
  */
-class DatePeriodTest extends TestCase
+class DatePeriodTest extends BaseTestCase
 {
     public function testConstructorVisibilityAndArguments()
     {

tests/Meritoo/Common/Test/Utilities/DateTest.php

@@ -6,14 +6,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Utilities;
+namespace Meritoo\Common\Test\Utilities;
 
 use DateInterval;
 use DateTime;
 use Generator;
 use Meritoo\Common\Exception\Date\UnknownDatePartTypeException;
+use Meritoo\Common\Test\Base\BaseTestCase;
 use Meritoo\Common\Utilities\Date;
-use Meritoo\Common\Utilities\TestCase;
 
 /**
  * Tests of the Date methods (only static functions)
@@ -21,7 +21,7 @@ use Meritoo\Common\Utilities\TestCase;
  * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
  * @copyright Meritoo.pl
  */
-class DateTest extends TestCase
+class DateTest extends BaseTestCase
 {
     /**
      * @param mixed $value Empty value, e.g. ""
@@ -454,8 +454,11 @@ class DateTest extends TestCase
         $start = 1;
         $end = 100;
 
-        $intervalMinDate = (clone $startDate)->add(new DateInterval(sprintf('P%dD', $start)));
+        $minDate = clone $startDate;
-        $intervalMaxDate = (clone $startDate)->add(new DateInterval(sprintf('P%dD', $end)));
+        $maxDate = clone $startDate;
+
+        $intervalMinDate = $minDate->add(new DateInterval(sprintf('P%dD', $start)));
+        $intervalMaxDate = $maxDate->add(new DateInterval(sprintf('P%dD', $end)));
 
         $randomDate = Date::getRandomDate();
         self::assertTrue($randomDate >= $intervalMinDate && $randomDate <= $intervalMaxDate);
@@ -471,7 +474,9 @@ class DateTest extends TestCase
     public function testGetRandomDateIncorrectEnd(DateTime $startDate, $start, $end)
     {
         $randomDate = Date::getRandomDate($startDate, $start, $end);
-        $intervalDate = (clone $startDate)->add(new DateInterval(sprintf('P%dD', $start)));
+
+        $cloned = clone $startDate;
+        $intervalDate = $cloned->add(new DateInterval(sprintf('P%dD', $start)));
 
         self::assertTrue($randomDate >= $intervalDate && $randomDate <= $intervalDate);
     }
@@ -487,8 +492,11 @@ class DateTest extends TestCase
     {
         $randomDate = Date::getRandomDate($startDate, $start, $end);
 
-        $intervalMinDate = (clone $startDate)->add(new DateInterval(sprintf('P%dD', $start)));
+        $minDate = clone $startDate;
-        $intervalMaxDate = (clone $startDate)->add(new DateInterval(sprintf('P%dD', $end)));
+        $maxDate = clone $startDate;
+
+        $intervalMinDate = $minDate->add(new DateInterval(sprintf('P%dD', $start)));
+        $intervalMaxDate = $maxDate->add(new DateInterval(sprintf('P%dD', $end)));
 
         self::assertTrue($randomDate >= $intervalMinDate && $randomDate <= $intervalMaxDate);
     }

tests/Meritoo/Common/Test/Utilities/GeneratorUtilityTest.php

@@ -6,10 +6,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Utilities;
+namespace Meritoo\Common\Test\Utilities;
 
+use Meritoo\Common\Test\Base\BaseTestCase;
 use Meritoo\Common\Utilities\GeneratorUtility;
-use Meritoo\Common\Utilities\TestCase;
 
 /**
  * Tests of the useful methods for the Generator class
@@ -17,7 +17,7 @@ use Meritoo\Common\Utilities\TestCase;
  * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
  * @copyright Meritoo.pl
  */
-class GeneratorUtilityTest extends TestCase
+class GeneratorUtilityTest extends BaseTestCase
 {
     public function testGetGeneratorElements()
     {

tests/Meritoo/Common/Test/Utilities/LocaleTest.php

@@ -6,11 +6,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Utilities;
+namespace Meritoo\Common\Test\Utilities;
 
 use Generator;
+use Meritoo\Common\Test\Base\BaseTestCase;
 use Meritoo\Common\Utilities\Locale;
-use Meritoo\Common\Utilities\TestCase;
 
 /**
  * Tests of the useful locale methods
@@ -18,7 +18,7 @@ use Meritoo\Common\Utilities\TestCase;
  * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
  * @copyright Meritoo.pl
  */
-class LocaleTest extends TestCase
+class LocaleTest extends BaseTestCase
 {
     /**
      * @param mixed $languageCode Empty value, e.g. ""

tests/Meritoo/Common/Test/Utilities/MimeTypesTest.php

@@ -6,11 +6,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Utilities;
+namespace Meritoo\Common\Test\Utilities;
 
 use Generator;
+use Meritoo\Common\Test\Base\BaseTestCase;
 use Meritoo\Common\Utilities\MimeTypes;
-use Meritoo\Common\Utilities\TestCase;
 
 /**
  * Tests of the useful methods for mime types of files
@@ -18,7 +18,7 @@ use Meritoo\Common\Utilities\TestCase;
  * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
  * @copyright Meritoo.pl
  */
-class MimeTypesTest extends TestCase
+class MimeTypesTest extends BaseTestCase
 {
     /**
      * @param mixed $mimeType Empty value, e.g. ""

tests/Meritoo/Common/Test/Utilities/MiscellaneousTest.php

@@ -6,14 +6,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Utilities;
+namespace Meritoo\Common\Test\Utilities;
 
 use Generator;
 use Meritoo\Common\Exception\Regex\IncorrectColorHexLengthException;
 use Meritoo\Common\Exception\Regex\InvalidColorHexValueException;
+use Meritoo\Common\Test\Base\BaseTestCase;
 use Meritoo\Common\Utilities\Locale;
 use Meritoo\Common\Utilities\Miscellaneous;
-use Meritoo\Common\Utilities\TestCase;
 use stdClass;
 
 /**
@@ -22,7 +22,7 @@ use stdClass;
  * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
  * @copyright Meritoo.pl
  */
-class MiscellaneousTest extends TestCase
+class MiscellaneousTest extends BaseTestCase
 {
     private $stringSmall;
     private $stringCommaSeparated;

tests/Meritoo/Common/Test/Utilities/Reflection/A.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Utilities\Reflection;
+namespace Meritoo\Common\Test\Utilities\Reflection;
 
 /**
  * The A class.

tests/Meritoo/Common/Test/Utilities/Reflection/B.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Utilities\Reflection;
+namespace Meritoo\Common\Test\Utilities\Reflection;
 
 /**
  * The B class.

tests/Meritoo/Common/Test/Utilities/Reflection/C.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Utilities\Reflection;
+namespace Meritoo\Common\Test\Utilities\Reflection;
 
 /**
  * The C class.

tests/Meritoo/Common/Test/Utilities/Reflection/D.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Utilities\Reflection;
+namespace Meritoo\Common\Test\Utilities\Reflection;
 
 /**
  * The D class.

tests/Meritoo/Common/Test/Utilities/Reflection/E.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Utilities\Reflection;
+namespace Meritoo\Common\Test\Utilities\Reflection;
 
 /**
  * The E trait.

tests/Meritoo/Common/Test/Utilities/ReflectionTest.php

@@ -6,20 +6,20 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Utilities;
+namespace Meritoo\Common\Test\Utilities;
 
 use DateTime;
 use Generator;
 use Meritoo\Common\Exception\Reflection\CannotResolveClassNameException;
 use Meritoo\Common\Exception\Reflection\MissingChildClassesException;
 use Meritoo\Common\Exception\Reflection\TooManyChildClassesException;
-use Meritoo\Common\Tests\Utilities\Reflection\A;
+use Meritoo\Common\Test\Base\BaseTestCase;
-use Meritoo\Common\Tests\Utilities\Reflection\B;
+use Meritoo\Common\Test\Utilities\Reflection\A;
-use Meritoo\Common\Tests\Utilities\Reflection\C;
+use Meritoo\Common\Test\Utilities\Reflection\B;
-use Meritoo\Common\Tests\Utilities\Reflection\D;
+use Meritoo\Common\Test\Utilities\Reflection\C;
-use Meritoo\Common\Tests\Utilities\Reflection\E;
+use Meritoo\Common\Test\Utilities\Reflection\D;
+use Meritoo\Common\Test\Utilities\Reflection\E;
 use Meritoo\Common\Utilities\Reflection;
-use Meritoo\Common\Utilities\TestCase;
 
 /**
  * Tests of the useful reflection methods
@@ -27,7 +27,7 @@ use Meritoo\Common\Utilities\TestCase;
  * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
  * @copyright Meritoo.pl
  */
-class ReflectionTest extends TestCase
+class ReflectionTest extends BaseTestCase
 {
     /**
      * @param mixed $invalidClass Empty value, e.g. ""
@@ -88,7 +88,7 @@ class ReflectionTest extends TestCase
         /*
          * Existing class
          */
-        self::assertEquals('Meritoo\Common\Tests\Utilities', Reflection::getClassNamespace(self::class));
+        self::assertEquals('Meritoo\Common\Test\Utilities', Reflection::getClassNamespace(self::class));
         self::assertEquals(DateTime::class, Reflection::getClassNamespace(new DateTime()));
 
         self::assertEquals(DateTime::class, Reflection::getClassNamespace([

tests/Meritoo/Common/Test/Utilities/RegexTest.php

@@ -8,16 +8,17 @@
 
 namespace Meritoo\Common\Utilities;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * Tests of the useful regular expressions methods
  *
  * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
  * @copyright Meritoo.pl
  */
-class RegexTest extends \PHPUnit_Framework_TestCase
+class RegexTest extends TestCase
 {
     private $simpleText;
-
     private $camelCaseText;
 
     public function testGetCamelCaseParts()

tests/Meritoo/Common/Test/Utilities/UriTest.php

@@ -6,9 +6,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Utilities;
+namespace Meritoo\Common\Test\Utilities;
 
-use Meritoo\Common\Utilities\TestCase;
+use Meritoo\Common\Test\Base\BaseTestCase;
 use Meritoo\Common\Utilities\Uri;
 
 /**
@@ -17,7 +17,7 @@ use Meritoo\Common\Utilities\Uri;
  * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
  * @copyright Meritoo.pl
  */
-class UriTest extends TestCase
+class UriTest extends BaseTestCase
 {
     public function testAddProtocolToUrl()
     {

tests/Meritoo/Common/Test/Utilities/XmlTest.php

@@ -6,10 +6,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Tests\Utilities;
+namespace Meritoo\Common\Test\Utilities;
 
 use Meritoo\Common\Utilities\Xml;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use SimpleXMLElement;
 
 /**
@@ -18,7 +18,7 @@ use SimpleXMLElement;
  * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
  * @copyright Meritoo.pl
  */
-class XmlTest extends PHPUnit_Framework_TestCase
+class XmlTest extends TestCase
 {
     private $simpleXml;
     private $advancedXml;