Merge pull request #4 from wiosna-dev/feature/WZUW-265

[WZUW-265] Updated doctrine/orm package version

.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
 

.travis.yml

@@ -11,7 +11,7 @@ before_install:
   - composer global require hirak/prestissimo
 
 install:
-- travis_wait 30 composer install
+  - travis_wait 30 composer install -v
 
 script:
   - php ./vendor/bin/phpunit

CHANGELOG.md

@@ -2,6 +2,52 @@
 
 Common and useful classes, methods, exceptions etc.
 
+# 0.1.8
+
+1. Size, e.g. of image
+
+# 0.1.7
+
+1. Collection > create trait (to make it more flexible)
+
+# 0.1.6
+
+1. Arrays > refactoring & more tests
+2. ValueObject > Human > represents a human
+3. Tests > use `Meritoo\Test\Common` namespace (instead of `Meritoo\Common\Test`)
+4. Tests > use @dataProvider
+
+# 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
+2. Utilities > Date > update descriptions of methods
+3. Docker > docker-compose.yml > add "phpunit" service > used to run PHPUnit's tests
+4. Reflection > setPropertiesValues() method > sets values of properties in given object
+
+# 0.1.3
+
+1. Tests > refactoring & minor improvements
+2. Utilities > CssSelector > useful methods related to CSS selectors
+3. Utilities > Bootstrap4CssSelector > useful methods related to CSS selectors and the Bootstrap4 (front-end component library)
+
+# 0.1.2
+
+1. Documentation > Value Objects
+2. Docker > improve performance
+3. Utilities > Reflection > setPropertyValue() method > sets value of given property
+
 # 0.1.1
 
 1. TravisCI > run using PHP 7.2 too

README.md

@@ -2,14 +2,26 @@
 
 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) [![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)
+[![PHP Version](https://img.shields.io/badge/php-%3E%3D5.6-blue.svg)](https://img.shields.io/badge/php-%3E%3D5.6-blue.svg) [![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) [![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
 
+In your `composer.json` add address of repository into `repositories` section:
+
+```json
+"repositories": [
+    (...)
+    {
+        "type": "vcs",
+        "url": "https://github.com/wiosna-dev/common-library"
+    }
+]
+```
+
 Run [Composer](https://getcomposer.org) to install this package in your project:
 
 ```bash
-composer require meritoo/common-library
+composer require wiosna-dev/common-library
 ```
 
 > [How to install Composer?](https://getcomposer.org/download)
@@ -20,6 +32,9 @@ 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.1
+0.1.8

build.xml

@@ -1,46 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <project name="Meritoo Package" basedir="." default="build:main" phingVersion="2.14.0">
     <!-- Properties -->
     <if>
-        <available file="phing/properties" property="custom.properties.available"/>
+        <available file="${project.basedir}/phing/properties" property="custom.properties.available"/>
         <then>
-            <property file="phing/properties"/>
+            <property file="${project.basedir}/phing/properties"/>
         </then>
         <else>
-            <property file="phing/properties.dist"/>
+            <property file="${project.basedir}/phing/properties.dist"/>
         </else>
     </if>
 
     <!-- Default / main target -->
     <target name="build:main"
-            depends="build:app, build:tests"
-            description="Builds everything and runs all tests" />
+            depends="build:app,
+                    build:tests"
+    />
 
     <!-- Build app -->
-    <target name="build:app" description="Prepares app to build and tests">
-        <phing phingfile="phing/app.xml" haltonfailure="true"/>
+    <target name="build:app">
+        <phing phingfile="${project.basedir}/phing/app.xml" haltonfailure="true"/>
     </target>
 
     <!-- Build tests -->
-    <target name="build:tests" description="Runs all tests, checks and creates docs">
-        <phing phingfile="phing/tests.xml" haltonfailure="true"/>
-
-        <!--
-        Conditional running of tests.
-        Disabled, because not required.
-
-        Meritoo <github@meritoo.pl>
-        2017-02-22
-
-        <if>
-            <equals arg1="${env}" arg2="test" />
-            <then>
-                <phing phingfile="phing/tests.xml" haltonfailure="true" />
-            </then>
-            <else>
-                <echo message="[Skipped] Running tests, checks and creating docs, because it's a not 'test' environment..." />
-            </else>
-        </if>
-        -->
+    <target name="build:tests">
+        <phing phingfile="${project.basedir}/phing/tests.xml" haltonfailure="true"/>
     </target>
 </project>

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "meritoo/common-library",
+    "name": "wiosna-dev/common-library",
     "description": "Useful classes, methods, extensions etc.",
     "license": "MIT",
     "authors": [
@@ -11,14 +11,18 @@
     ],
     "require": {
         "php": ">=5.6",
+        "ext-dom": "*",
+        "ext-fileinfo": "*",
+        "ext-json": "*",
+        "ext-simplexml": "*",
+        "ext-intl": "*",
         "ext-pcre": "*",
-        "doctrine/orm": "^2.5",
-        "gedmo/doctrine-extensions": "^2.4"
+        "doctrine/orm": "^2.16",
+        "gedmo/doctrine-extensions": "^2.4 || ^3.11"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.2",
         "pdepend/pdepend": "^2.5",
-        "phploc/phploc": "^2.1",
         "phpmd/phpmd": "^2.6",
         "phpunit/phpunit": "^4.8",
         "sebastian/phpcpd": "^2.0",
@@ -31,7 +35,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Meritoo\\Common\\Test\\": "tests/"
+            "Meritoo\\Test\\Common\\": "tests/"
         }
     },
     "config": {

docker-compose.yml

@@ -1,6 +1,9 @@
 version: '3'
 
 services:
+    #
+    # Required to run project
+    #
     php:
         image: ${DOCKER_CONTAINER_OWNER}/${DOCKER_CONTAINER_PROJECT}-php
         container_name: ${DOCKER_CONTAINER_OWNER}-${DOCKER_CONTAINER_PROJECT}-php
@@ -9,12 +12,22 @@ services:
         build:
             context: ./docker/config
             args:
-                - TIMEZONE=$TIMEZONE
+                - TIMEZONE=${TIMEZONE}
         volumes:
-            - .:/project
+            - .:/project:cached
     composer:
         image: ${DOCKER_CONTAINER_OWNER}/${DOCKER_CONTAINER_PROJECT}-php
         container_name: ${DOCKER_CONTAINER_OWNER}-${DOCKER_CONTAINER_PROJECT}-composer
-        entrypoint: composer
+        entrypoint: php -d memory_limit=-1 /usr/local/bin/composer
         volumes:
-            - .:/project
+            - .:/project:cached
+    #
+    # Required to run PHPUnit's tests
+    #
+    phpunit:
+        image: ${DOCKER_CONTAINER_OWNER}/${DOCKER_CONTAINER_PROJECT}-php
+        container_name: ${DOCKER_CONTAINER_OWNER}-${DOCKER_CONTAINER_PROJECT}-phpunit
+        entrypoint: ./vendor/bin/phpunit
+        command: --version
+        volumes:
+            - .:/project:cached

docker/config/Dockerfile

@@ -98,7 +98,7 @@ ENV COMPOSER_ALLOW_SUPERUSER 1
 #
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
     && php -r "if (hash_file('SHA384', 'composer-setup.php') === \
-        '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo \
+        '93b54496392c062774670ac18b134c3b3a95e5a5e5c8f1a9f115f203b75bf9a129d5daa8ba6a13e2cc8a1da0806388a8') { echo \
         'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
     && php composer-setup.php --install-dir=/usr/local/bin --filename=composer \
     && php -r "unlink('composer-setup.php');" \

docs/Base-test-case.md

@@ -48,5 +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,5 +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/Development.md

@@ -15,11 +15,11 @@ Development-related information
     docker-compose up -d
     ```
 
-2. Install packages by running command:
+2. Rebuild project by running command (installs packages, prepares required directories and runs tests):
 
-    ```bash
-    docker-compose run composer install
-    ```
+	```bash
+	docker-compose exec php phing
+	```
 
 > [What is Docker?](https://www.docker.com/what-docker)
 
@@ -28,7 +28,7 @@ Development-related information
 Available as `composer` service. You can run any Composer's command using the `composer` service:
 
 ```bash
-docker-compose run composer <command>
+docker-compose run --rm composer [command]
 ```
 
 Examples below.
@@ -36,25 +36,25 @@ Examples below.
 ##### Install packages
 
 ```bash
-docker-compose run composer install
+docker-compose run --rm composer install
 ```
 
 ##### Update packages
 
 ```bash
-docker-compose run composer update
+docker-compose run --rm composer update
 ```
 
 ##### Add package
 
 ```bash
-docker-compose run composer require <vendor>/<package>
+docker-compose run --rm composer require [vendor]/[package]
 ```
 
 ##### Remove package
 
 ```bash
-docker-compose run composer remove <vendor>/<package>
+docker-compose run --rm composer remove [vendor]/[package]
 ```
 
 # Coding Standards Fixer
@@ -65,6 +65,12 @@ Fix coding standard by running command:
 docker-compose exec php php-cs-fixer fix
 ```
 
+or
+
+```bash
+docker-compose exec php phing -f phing/tests.xml build:fix-coding-standards
+```
+
 Omit cache and run the Fixer from scratch by running command:
 
 ```bash
@@ -77,37 +83,35 @@ docker-compose exec php rm .php_cs.cache && docker-compose exec php php-cs-fixer
 
 ### Prerequisites
 
-Install required packages by running command: `docker-compose run composer install`.
+Install required packages by running command: `docker-compose run --rm composer install`.
 
-### Running tests
+### Running [PHPUnit](https://phpunit.de) tests
 
-#### Simply & quick, without code coverage
-
-Tests are running using Docker and `php` service defined in `docker-compose.yml`. Example:
+##### Easy (with code coverage)
 
 ```bash
-docker-compose exec php phpunit --no-coverage
+docker-compose run --rm phpunit --verbose
 ```
 
-You can also run them in container. In this case you have to run 2 commands:
-1. Enter container:
-
-    ```bash
-	docker-compose exec php bash
-    ```
-
-2. Run tests:
-
-    ```bash
-    phpunit --no-coverage
-    ```
-
-#### With code coverage
+or
 
 ```bash
-docker-compose exec php phpunit
+docker-compose exec php phing -f phing/tests.xml test:phpunit
 ```
 
+##### Quick (without code coverage)
+
+```bash
+docker-compose run --rm phpunit --verbose --no-coverage
+```
+
+# Versions of packages
+
+### squizlabs/php_codesniffer
+
+I have to use [squizlabs/php_codesniffer](https://packagist.org/packages/squizlabs/php_codesniffer) `^2.9` instead of
+`^3.3`, because [Phing doesn't support 3.x PHP_CodeSniffer](https://github.com/phingofficial/phing/issues/716).
+
 # Other
 
 Rebuild project and run tests by running command:

docs/Exceptions.md

@@ -57,5 +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,5 +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

@@ -0,0 +1,303 @@
+# Meritoo Common Library
+
+Common and useful classes, methods, exceptions etc.
+
+# Value Objects
+
+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"
+```
+
+### Human
+
+##### Namespace
+
+`Meritoo\Common\ValueObject\Human`
+
+##### Info
+
+Represents human. Based on `\Meritoo\Common\Traits\ValueObject\HumanTrait` trait. Contains properties same as `HumanTrait` trait:
+1. `$firstName` - first name
+2. `$lastName` - last name
+3. `$email` - email address
+4. `$birthDate` - birth date
+
+##### New instance
+
+New instance can be created using constructor:
+
+```php
+new Human('John', 'Scott', 'john@scott.com', new \DateTime('2001-01-01'));
+```
+
+##### Methods
+
+Has getters for each property, e.g. `getFirstName()`, `getEmail()` etc.
+
+##### Conversion to string (the `__toString()` method)
+
+Instance of `Human` may be represented as string that contains first name, last name and email address (if provided).
+
+Example:
+
+```php
+$human1 = new Human('John', 'Scott');
+$asString1 = (string)$human1; // "John Scott"
+
+$human2 = new Human('John', 'Scott', 'john@scott.com', new \DateTime('2001-01-01'));
+$asString2 = (string)$human2; // "John Scott <john@scott.com>"
+```
+
+### Size
+
+##### Namespace
+
+`Meritoo\Common\ValueObject\Size`
+
+##### Info
+
+Size, e.g. of image. Contains properties:
+1. `width` - the width
+2. `height` - the height
+3. `unit` - unit used when width or height should be returned with unit, default: `"px"`
+4. `separator` - separator used when converting to string, default: `" x "`
+
+##### New instance
+
+New instance can be created using static methods:
+
+1. `fromArray()` - creates new instance from given array
+
+    ```php
+    // Using default "px" unit
+    Size::fromArray([200, 100]);
+
+    // With custom "mm" unit
+    Size::fromArray([200, 100], 'mm');
+    ```
+
+2. `fromString()` - creates new instance from given string
+
+    ```php
+    // Using default "px" unit and default " x " separator
+    Size::fromString('200 x 100');
+
+	// With custom "mm" unit and " X " separator
+    Size::fromString('200 X 100', 'mm', ' X ');
+    ```
+
+##### Methods
+
+Has:
+- getters and setters for `width` and `height` properties.
+- setter for `separator` property
+- `toString()` and `toArray()` methods that returns size represented as string and array
+
+##### Conversion to string (using `__toString()` method)
+
+Instance of `Size` may be represented as string that contains width and height separated by separator (default: `" x "`).
+
+Example:
+
+```php
+$size = Size::fromArray([200, 100]);
+
+// With default separator
+$asString1 = (string)$size; // "200 x 100"
+
+// With custom separator
+$size->setSeparator('X');
+$asString2 = (string)$size; // "200X100"
+```
+
+### Version
+
+##### Namespace
+
+`Meritoo\Common\ValueObject\Version`
+
+##### Info
+
+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
+
+##### New instance
+
+New instance can be created using:
+
+1. Constructor:
+
+	```php
+    new Version(1, 0, 2);
+    ```
+
+2. Static methods:
+	1. `fromArray()` - creates new instance using given version as array
+
+	```php
+	Version::fromArray([1, 0, 2]);
+	```
+
+	2. `fromString()` - creates new instance using given version as string:
+
+	```php
+    Version::fromString('1.0.2');
+    ```
+
+##### Methods
+
+Has getters for each property: `getMajorPart()`, `getMinorPart()`, `getPatchPart()`.
+
+##### Conversion to string (using `__toString()` method)
+
+Instance of `Version` may be represented as string that contains all properties separated by `.` (`$majorPart`.`$minorPart`.`$patchPart`).
+
+Example:
+
+```php
+$version = new Version(1, 0, 2);
+$asString = (string)$version; // "1.0.2"
+```
+
+# 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](Static-methods/Regex.md)
+5. [**Value Objects**](Value-Objects.md)
+
+[&lsaquo; Back to `Readme`](../README.md)

phing/app.xml

@@ -1,98 +1,184 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="Meritoo Package" basedir="." default="build:main" phingVersion="2.14.0">
+
+<project name="Meritoo Package" basedir="." default="build:main" phingVersion="2.16.0">
     <!-- Properties -->
     <if>
-        <available file="phing/properties" property="custom.properties.available"/>
+        <available file="${project.basedir}/phing/properties" property="custom.properties.available"/>
         <then>
-            <property file="phing/properties"/>
+            <property file="${project.basedir}/phing/properties"/>
         </then>
         <else>
-            <property file="phing/properties.dist"/>
+            <property file="${project.basedir}/phing/properties.dist"/>
         </else>
     </if>
 
+    <!-- Filesets -->
+    <import file="${project.basedir}/phing/filesets.xml"/>
+
     <!-- Default / main target -->
     <target name="build:main"
             depends="build:app"
-            description="Builds the application" />
+    />
 
     <!-- App target -->
     <target name="build:app"
-            depends="app:composer, app:vendors, app:checkout"
-            description="Prepares app to build." />
-
-    <!-- Updates Composer and validates composer.* files -->
-    <target name="app:composer" description="Updates Composer and validates composer.* files">
-        <echo msg="Updating Composer and validating composer.* files..." />
+            depends="app:clean,
+                    app:composer:self-update,
+                    app:composer:install,
+                    app:composer:validate,
+                    app:checkout"
+    />
 
+    <!-- Updates Composer -->
+    <target name="app:composer:self-update">
         <if>
-            <available file="composer.phar" />
+            <not>
+                <available file="${composer.path}" property="composer.local.unavailable"/>
+            </not>
             <then>
-                <echo msg="[Skipped] Downloading of Composer skipped, because exist in the project..." />
-            </then>
-            <else>
                 <if>
-                    <os family="windows" />
+                    <os family="windows"/>
                     <then>
-                        <fail message="Composer not found! Go to http://getcomposer.org/download and download the Composer." />
+                        <fail message="Composer not found! Go to http://getcomposer.org/download and download the Composer."/>
                     </then>
                     <else>
-                        <exec command="${composer.download_command}" checkreturn="true" />
+                        <exec command="${composer.download_command}" checkreturn="true" passthru="true"/>
                     </else>
                 </if>
-            </else>
+            </then>
         </if>
 
         <!-- Update Composer -->
-        <composer command="selfupdate" />
-
-        <!-- Validate Composer -->
-        <composer command="validate">
-            <arg line="--no-check-all --strict" />
+        <composer php="${composer.php}" composer="${composer.path}" command="selfupdate">
+            <arg value="--ansi"/>
         </composer>
     </target>
 
-    <!-- Project Install/update vendors -->
-    <target name="app:vendors" description="Installs / updates vendors">
-        <echo msg="Installing / updating vendors..." />
+    <!-- Validates composer.* files -->
+    <target name="app:composer:validate" depends="app:composer:install">
+        <composer php="${composer.php}" composer="${composer.path}" command="validate">
+            <arg value="--no-check-all"/>
+            <arg value="--strict"/>
+            <arg value="--ansi"/>
+        </composer>
+    </target>
 
+    <!-- Project clean -->
+    <target name="app:clean">
         <if>
-            <istrue value="${composer.self-update}"/>
+            <equals arg1="${env}" arg2="prod"/>
             <then>
-                <composer php="${composer.php}" composer="${composer.path}" command="self-update"/>
-            </then>
-        </if>
-
-        <if>
-            <istrue value="${composer.validate}"/>
-            <then>
-                <composer php="${composer.php}" composer="${composer.path}" command="validate"/>
-            </then>
-        </if>
-
-        <if>
-            <equals arg1="${env}" arg2="prod" />
-            <then>
-                <composer php="${composer.php}" composer="${composer.path}" command="install">
-                    <arg value="--optimize-autoloader" />
-                    <arg value="--prefer-dist" />
-                    <arg value="--classmap-authoritative" />
-                </composer>
+                <echo message="[Skipped] Cleaning project (and directories cleanup) -> 'prod' environment"/>
             </then>
             <else>
-                <composer php="${composer.php}" composer="${composer.path}" command="install" />
+                <foreach list="${directoriesToEmpty}" param="directory" target="app:clean:empty"/>
             </else>
         </if>
+
+        <foreach list="${directoriesToCheck}" param="directory" target="app:clean:check"/>
+
+        <touch file="${dir.cache}/.gitkeep"/>
+        <touch file="${dir.logs}/.gitkeep"/>
+        <touch file="${dir.sessions}/.gitkeep"/>
+
+        <foreach list="${directoriesToEmpty}" param="directory" target="app:permissions"/>
+    </target>
+
+    <!-- Cleaning directory (making empty) directory -->
+    <target name="app:clean:empty">
+        <if>
+            <available file="${directory}" type="dir" property="dir_is_available"/>
+            <then>
+                <delete includeemptydirs="true" dir="${directory}"/>
+            </then>
+        </if>
+    </target>
+
+    <!-- Checking if directory exists -->
+    <target name="app:clean:check">
+        <if>
+            <not>
+                <available file="${directory}" type="dir" property="dir_is_available"/>
+            </not>
+            <then>
+                <if>
+                    <or>
+                        <contains string="${directory}" substring="cache"/>
+                        <contains string="${directory}" substring="logs"/>
+                        <contains string="${directory}" substring="sessions"/>
+                    </or>
+                    <then>
+                        <mkdir dir="${directory}" mode="0777"/>
+                    </then>
+                    <else>
+                        <mkdir dir="${directory}" mode="0775"/>
+                    </else>
+                </if>
+            </then>
+        </if>
+    </target>
+
+    <!-- Installs vendors -->
+    <target name="app:composer:install" depends="app:composer:self-update">
+        <composer php="${composer.php}" composer="${composer.path}" command="install">
+            <arg value="--optimize-autoloader"/>
+            <arg value="--ansi"/>
+        </composer>
+    </target>
+
+    <!-- Clearing cache -->
+    <target name="app:cache">
+        <if>
+            <istrue value="${cache.clearWithWarmup}"/>
+            <then>
+                <SymfonyConsole console="bin/console" command="cache:clear">
+                    <arg name="env" value="${env}"/>
+                </SymfonyConsole>
+            </then>
+            <else>
+                <SymfonyConsole console="bin/console" command="cache:clear">
+                    <arg name="env" value="${env}"/>
+                    <arg name="no-warmup"/>
+                </SymfonyConsole>
+            </else>
+        </if>
+    </target>
+
+    <!-- Clearing cache (faster) -->
+    <target name="app:cache:faster">
+        <SymfonyConsole console="bin/console" command="cache:clear">
+            <arg name="env" value="${env}"/>
+            <arg name="no-optional-warmers"/>
+        </SymfonyConsole>
+    </target>
+
+    <!-- Warming up cache -->
+    <target name="app:cache:warmup">
+        <SymfonyConsole console="bin/console" command="cache:warmup">
+            <arg name="env" value="${env}"/>
+        </SymfonyConsole>
+    </target>
+
+    <!-- Setting permissions of given directory -->
+    <target name="app:permissions">
+        <if>
+            <not>
+                <os family="windows"/>
+            </not>
+            <then>
+                <exec command="chmod -R 777 ${directory}/*"/>
+            </then>
+        </if>
     </target>
 
     <!-- Checkout and finalization -->
     <target name="app:checkout">
         <tstamp>
-            <format property="date_end" pattern="%Y-%m-%d %H:%M" />
+            <format property="date_end" pattern="%Y-%m-%d %H:%M"/>
         </tstamp>
 
-        <echo msg="------------------------------------" />
-        <echo msg="Build finished at: ${date_end}" />
-        <echo msg="------------------------------------" />
+        <echo msg="------------------------------------"/>
+        <echo msg="Build finished at: ${date_end}"/>
+        <echo msg="------------------------------------"/>
     </target>
 </project>

phing/composer-install.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+EXPECTED_SIGNATURE="$(curl -L https://composer.github.io/installer.sig)"
+# Original line (with wget):
+# EXPECTED_SIGNATURE="$(wget -q -O - 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" ]]
+then
+    >&2 echo 'ERROR: Invalid installer signature'
+    rm composer-setup.php
+    exit 1
+fi
+
+php composer-setup.php --quiet
+RESULT=$?
+rm composer-setup.php
+exit ${RESULT}

phing/filesets.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="Meritoo Package" basedir="." default="build:main" phingVersion="2.16.0">
+    <!-- Filesets -->
+    <fileset id="cache" dir="${dir.cache}">
+        <include name="**/*"/>
+        <exclude name=".gitkeep"/>
+    </fileset>
+    <fileset id="logs" dir="${dir.logs}">
+        <include name="**/*"/>
+        <exclude name=".gitkeep"/>
+    </fileset>
+    <fileset id="sessions" dir="${dir.sessions}">
+        <include name="**/*"/>
+        <exclude name=".gitkeep"/>
+    </fileset>
+
+    <!-- Directories to check -->
+    <property name="directoriesToCheck" value="
+        ${dir.cache},
+        ${dir.logs},
+        ${dir.sessions},
+        ${dir.data.tests},
+        ${dir.data.temporary},
+        ${dir.docker.data},
+        ${dir.docker.logs}"
+    />
+
+    <!-- Directories to empty -->
+    <property name="directoriesToEmpty" value="
+        ${dir.cache},
+        ${dir.logs},
+        ${dir.sessions},
+        ${dir.data.temporary}"
+    />
+</project>

phing/properties.dist

@@ -1,19 +1,3 @@
-# --------------------------------------------------------------------------------
-# Information
-# --------------------------------------------------------------------------------
-
-# Property files contain key/value pairs
-# key = value
-#
-# Property keys may contain alphanumeric chars and colons, but
-# not special chars. This way you can create pseudo-namespaces
-#
-# You can refer to values of other properties by enclosing their keys in "${}".
-# Example: dir.js = ${dir.web}/js
-#
-# Everything behind the equal sign is the value, you do
-# not have to enclose strings: text=This is some text, Your OS is ${php.os}
-
 # --------------------------------------------------------------------------------
 # Common, e.g. default environment
 # --------------------------------------------------------------------------------
@@ -22,10 +6,6 @@
 #
 env = dev
 
-# Install assets using symlinks
-#
-assets.installWithSymlink = true
-
 # Clear cache with the "warmup" option
 #
 # The cache:clear command should always be called with the --no-warmup option. Warmup should be done via the cache:warmup command.
@@ -40,67 +20,63 @@ cache.clearWithWarmup = false
 # Composer
 # --------------------------------------------------------------------------------
 
-composer.download_command = php -r "eval('?>'.file_get_contents('https://getcomposer.org/installer'));"
-
-# Path to composer executable or composer.phar file
+# Command used to download Composer
 #
-composer.path = composer.phar
-#composer.path = /usr/local/bin/composer
+composer.download_command = bash ${project.basedir}/phing/composer-install.sh
+
+# Path to composer executable or downloaded composer.phar file
+#
+composer.path = ${project.basedir}/composer.phar
 
 # Path to php executable used by composer
 #
 composer.php = php
 
-# Self update of the composer
-#
-composer.self-update = false
-
-# Validate the composer.json file
-#
-composer.validate = false
-
 # --------------------------------------------------------------------------------
 # Directories
 # --------------------------------------------------------------------------------
 
 # System directories
 #
-dir.data = ${project.basedir}/data
 dir.src = ${project.basedir}/src
+dir.var = ${project.basedir}/tests/Resources/var
+dir.cache = ${dir.var}/cache
+dir.logs = ${dir.var}/log
+dir.sessions = ${dir.var}/sessions
+dir.data = ${project.basedir}/data
 dir.tests = ${project.basedir}/tests
 
-# --------------------------------------------------------------------------------
 # Build directories
-# --------------------------------------------------------------------------------
-
+#
 dir.build = ${project.basedir}/build
-dir.reports = ${dir.build}/logs
+dir.reports = ${dir.build}/reports
 dir.reports.pdepend = ${dir.reports}/pdepend
 dir.reports.coverage = ${dir.reports}/phpunit_coverage
-#
-# Disabled, because unnecessary right now
-# phpdocumentor/phpdocumentor cannot be installed via Composer
-#
-# Meritoo <github@meritoo.pl>
-# 2017-02-22
-#
-#dir.docs = ${dir.build}/docs
-#dir.docs.phpdoc2 = ${dir.docs}/phpdoc2
 
-# --------------------------------------------------------------------------------
 # Data directories
-# --------------------------------------------------------------------------------
-
+#
+dir.data.tests = ${dir.data}/tests
 dir.data.temporary = ${dir.data}/tmp
 
+# Docker directories
+#
+dir.docker = ${project.basedir}/docker
+dir.docker.data = ${dir.docker}/data/db
+dir.docker.logs = ${dir.docker}/logs/nginx
+
 # --------------------------------------------------------------------------------
 # Testing
 # --------------------------------------------------------------------------------
 
-# Path of the framework used to run unit tests
-#
-tests.framework.path = ./vendor/bin/phpunit --verbose --no-coverage --testdox
-
 # Path of the PHP Coding Standards Fixer (http://cs.sensiolabs.org)
 #
-phpCsFixer.path = ./vendor/bin/php-cs-fixer
+tests.cs_fixer.command = ./vendor/bin/php-cs-fixer fix --verbose
+
+# Test database path
+#
+tests.database = ${dir.data.temporary}/database.sqlite
+
+# Paths of frameworks used to run tests:
+# - PHPUnit (unit tests)
+#
+tests.phpunit.command = ./vendor/bin/phpunit --verbose

phing/tests.xml

@@ -1,230 +1,125 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="Meritoo Package" basedir="." default="build:main" phingVersion="2.14.0">
-    <!--
-    The AutoloaderTask is required to load binaries installed by Composer.
-    The "autoloaderpath" attribute of this task is not required, because it's default value is: vendor/autoload.php.
 
-    Meritoo <github@meritoo.pl>
-    2017-02-23
-    -->
-    <autoloader />
+<project name="Meritoo Package" basedir="." default="build:main" phingVersion="2.16.0">
+    <autoloader/>
 
     <!-- Properties -->
     <if>
-        <available file="phing/properties" property="custom.properties.available"/>
+        <available file="${project.basedir}/phing/properties" property="custom.properties.available"/>
         <then>
-            <property file="phing/properties"/>
+            <property file="${project.basedir}/phing/properties"/>
         </then>
         <else>
-            <property file="phing/properties.dist"/>
+            <property file="${project.basedir}/phing/properties.dist"/>
         </else>
     </if>
 
     <!-- Filesets -->
     <fileset id="sourcecode" dir="${dir.src}">
-        <include name="**/*.php" />
-        <exclude name="*Test.php" />
-        <exclude name="**/*Test.php" />
-        <exclude name="**/Resources/**" />
-        <exclude name="**/DataFixtures/**" />
-        <exclude name="**/Tests/**" />
+        <include name="**/*.php"/>
+        <exclude name="*Test.php"/>
+        <exclude name="**/*Test.php"/>
+        <exclude name="**/Resources/**"/>
+        <exclude name="**/DataFixtures/**"/>
+        <exclude name="**/Tests/**"/>
     </fileset>
     <fileset id="tests" dir="${dir.tests}">
-        <include name="**/*Test*.php" />
+        <include name="**/*Test*.php"/>
     </fileset>
 
     <!-- Default / main target -->
     <target name="build:main"
-            depends="build:fix-coding-standards, build:clean, build:prepare, build:check, build:test, app:checkout"
-            description="Runs all tests and builds everything" />
-    <!--
-    Before:
-    depends="build:fix-coding-standards, build:clean, build:prepare, build:check, build:test, build:doc, app:checkout"
-
-    After:
-    depends="build:fix-coding-standards, build:clean, build:prepare, build:check, build:test, app:checkout"
-
-    The "build:doc" task is disabled, because it cannot be installed via Composer:
-    a) phpdocumentor/phpdocumentor v2.9.0 requires symfony/validator ~2.2
-    b) symfony/validator ~2.2 causes to remove symfony/symfony 3.*
-
-    Meritoo <github@meritoo.pl>
-    2017-02-22
-    -->
+            depends="build:fix-coding-standards,
+                    build:check,
+                    build:test,
+                    app:checkout"
+    />
 
     <!-- Fixing coding standards using the PHP Coding Standards Fixer (http://cs.sensiolabs.org) -->
-    <target name="build:fix-coding-standards" description="Fixes coding standards using the PHP Coding Standards Fixer">
-        <echo msg="Fixing coding standards using the PHP Coding Standards Fixer (http://cs.sensiolabs.org)..." />
-
-        <!--
-        Attention.
-        Rules for formatting are defined in /.php_cs.dist file.
-        -->
-
-        <exec
-            passthru="true"
-            command="${phpCsFixer.path} fix --verbose"
-        />
+    <target name="build:fix-coding-standards">
+        <exec command="${tests.cs_fixer.command}" passthru="true"/>
     </target>
 
-    <!-- Doc target -->
-    <!--
-    Disabled, because it cannot be installed via Composer:
-    a) phpdocumentor/phpdocumentor v2.9.0 requires symfony/validator ~2.2
-    b) symfony/validator ~2.2 causes to remove symfony/symfony 3.*
-
-    Meritoo <github@meritoo.pl>
-    2017-02-22
-    -->
-    <!--<target name="build:doc"-->
-            <!--depends="build:prepare, doc:phpdoc2"-->
-            <!--description="Generates API documentation" />-->
-
     <!-- Check target -->
     <target name="build:check"
-            depends="check:cs, check:md, check:cpd, check:depend, check:loc"
-            description="Analyzes code" />
+            depends="check:cs,
+                    check:md,
+                    check:cpd,
+                    check:depend"
+    />
 
     <!-- Test target -->
     <target name="build:test"
-            depends="test:unit"
-            description="Executes all tests" />
-
-    <!-- Project build clean -->
-    <target name="build:clean" description="Cleans up build directories">
-        <echo msg="Cleaning docs and reports directories..." />
-        <!--<delete dir="${dir.docs}" />-->
-        <delete dir="${dir.reports}" />
-    </target>
-
-    <!-- Project build prepare -->
-    <target name="build:prepare" description="Create build directories">
-        <echo msg="Creating build directories..." />
-        <!--<mkdir dir="${dir.docs}" />-->
-        <!--<mkdir dir="${dir.docs.phpdoc2}" />-->
-        <mkdir dir="${dir.reports}" />
-        <mkdir dir="${dir.reports.pdepend}" />
-        <mkdir dir="${dir.reports.coverage}"/>
-    </target>
-
-    <!-- PHPDocumentor2 API documentation target -->
-    <!--
-    Disabled, because it cannot be installed via Composer:
-    a) phpdocumentor/phpdocumentor v2.9.0 requires symfony/validator ~2.2
-    b) symfony/validator ~2.2 causes to remove symfony/symfony 3.*
-
-    Meritoo <github@meritoo.pl>
-    2017-02-22
-
-    <target name="doc:phpdoc2" description="Generates API documentations">
-        <echo msg="Generating API Documentation with phpDocumentor 2..." />
-        <phpdoc2 title="${phing.project.name}"
-                 destdir="${dir.docs.phpdoc2}"
-                 template="responsive">
-            <fileset refid="sourcecode" />
-        </phpdoc2>
-    </target>
-    -->
+            depends="test:phpunit"
+    />
 
     <!-- Symfony2 code sniffer -->
-    <!--
-    Attention 1.
-    To use Symfony2 standards to check coding you have to:
-    copy, symlink or check out repo to a folder called Symfony2 inside the phpcs Standards directory.
-
-    Example:
-    $ pear config-show | grep php_dir
-    $ cd /path/to/pear/PHP/CodeSniffer/Standards
-    $ git clone git://github.com/opensky/Symfony2-coding-standard.git Symfony2
-
-    Attention 2.
-    PSR2 standard is used instead of Symfony2 standard, because after installation squizlabs/php_codesniffer package
-    via Composer the Symfony2 standard is not included / available in this package. In this case the PHP Coding
-    Standards Fixer (http://cs.sensiolabs.org) is used.
-
-    Meritoo <github@meritoo.pl>
-    2017-02-22
-    -->
-    <target name="check:cs" description="Checks coding standard">
-        <echo msg="Checking coding standard..." />
+    <target name="check:cs" depends="build:prepare">
         <phpcodesniffer standard="PSR2" showWarnings="true">
-            <fileset refid="sourcecode" />
-            <formatter type="checkstyle" outfile="${dir.reports}/checkstyle.xml" />
-            <formatter type="csv" outfile="${dir.reports}/checkstyle.csv" />
-            <formatter type="summary" outfile="${dir.reports}/checkstyle_summary.txt" />
+            <fileset refid="sourcecode"/>
+            <formatter type="checkstyle" outfile="${dir.reports}/checkstyle.xml"/>
+            <formatter type="csv" outfile="${dir.reports}/checkstyle.csv"/>
+            <formatter type="summary" outfile="${dir.reports}/checkstyle_summary.txt"/>
         </phpcodesniffer>
     </target>
 
     <!-- copy/paste detector -->
-    <target name="check:cpd" description="Checks similar code blocks.">
-        <echo msg="Checking similar code blocks..." />
+    <target name="check:cpd" depends="build:prepare">
         <phpcpd>
-            <fileset refid="sourcecode" />
-            <formatter type="pmd" outfile="${dir.reports}/pmd-cpd.xml" />
+            <fileset refid="sourcecode"/>
+            <formatter type="pmd" outfile="${dir.reports}/pmd-cpd.xml"/>
         </phpcpd>
-
-        <!--
-        Previous / old version
-
-        Meritoo <github@meritoo.pl>
-        2017-02-22
-
-        <exec command="phpcpd \-\-log-pmd=${dir.reports}/pmd-cpd.xml ${dir.src}" />
-        -->
     </target>
 
     <!-- Mess detector -->
-    <target name="check:md" description="Generate code metrics">
-        <echo msg="Generating code metrics..." />
+    <target name="check:md" depends="build:prepare">
         <phpmd rulesets="codesize,controversial,design,naming,unusedcode">
-            <fileset refid="sourcecode" />
-            <formatter type="html" outfile="${dir.reports}/phpmd.html" />
-            <formatter type="text" outfile="${dir.reports}/phpmd.txt" />
+            <fileset refid="sourcecode"/>
+            <formatter type="html" outfile="${dir.reports}/phpmd.html"/>
+            <formatter type="text" outfile="${dir.reports}/phpmd.txt"/>
         </phpmd>
     </target>
 
     <!-- Code dependency -->
-    <target name="check:depend" description="Checks coupling and dependency">
-        <echo msg="Checking coupling and dependency..." />
+    <target name="check:depend" depends="build:prepare">
         <phpdepend>
-            <fileset refid="sourcecode" />
-            <logger type="jdepend-xml" outfile="${dir.reports.pdepend}/jdepend.xml" />
-            <logger type="jdepend-chart" outfile="${dir.reports.pdepend}/dependencies.svg" />
-            <logger type="overview-pyramid" outfile="${dir.reports.pdepend}/overview-pyramid.svg" />
+            <fileset refid="sourcecode"/>
+            <logger type="jdepend-xml" outfile="${dir.reports.pdepend}/jdepend.xml"/>
+            <logger type="jdepend-chart" outfile="${dir.reports.pdepend}/dependencies.svg"/>
+            <logger type="overview-pyramid" outfile="${dir.reports.pdepend}/overview-pyramid.svg"/>
         </phpdepend>
     </target>
 
-    <!-- Measure the size and analyzing the structure of a project -->
-    <target name="check:loc" description="Measures the size and analyzes the structure of a project">
-        <echo msg="Measuring the size and analyzing the structure of a project..." />
-        <phploc reportType="txt" reportName="phploc" reportDirectory="${dir.reports}">
-            <fileset refid="sourcecode" />
-        </phploc>
-
-        <!--
-        Previous / old version
-
-        Meritoo <github@meritoo.pl>
-        2017-02-22
-
-        <exec command="phploc \-\-log-csv=${dir.reports}/phploc.csv ${dir.src}" />
-        -->
+    <!-- PHPUnit tests -->
+    <target name="test:phpunit" depends="build:prepare">
+        <exec command="${tests.phpunit.command}" passthru="true"/>
     </target>
 
-    <!-- Unit tests -->
-    <target name="test:unit" description="Executes unit tests">
-        <echo msg="Running unit tests..." />
-        <exec command="${tests.framework.path}" passthru="true"/>
+    <!-- Project build clean -->
+    <target name="build:clean">
+        <if>
+            <available file="${dir.reports}" type="dir" property="dir_is_available"/>
+            <then>
+                <delete dir="${dir.reports}"/>
+            </then>
+        </if>
+    </target>
+
+    <!-- Project build prepare -->
+    <target name="build:prepare" depends="build:clean">
+        <mkdir dir="${dir.reports}"/>
+        <mkdir dir="${dir.reports.pdepend}"/>
+        <mkdir dir="${dir.reports.coverage}"/>
     </target>
 
     <!-- Checkout and finalization -->
     <target name="app:checkout">
         <tstamp>
-            <format property="date_end" pattern="%Y-%m-%d %H:%M" />
+            <format property="date_end" pattern="%Y-%m-%d %H:%M"/>
         </tstamp>
 
-        <echo msg="--------------------------------------------" />
-        <echo msg="Build tests finished at: ${date_end}" />
-        <echo msg="--------------------------------------------" />
+        <echo msg="--------------------------------------------"/>
+        <echo msg="Build tests finished at: ${date_end}"/>
+        <echo msg="--------------------------------------------"/>
     </target>
 </project>

phpunit.xml.dist

@@ -1,28 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- https://phpunit.de/manual/4.8/en/appendixes.configuration.html -->
 <phpunit
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
-        backupGlobals="true"
-        backupStaticAttributes="false"
-        bootstrap="./vendor/autoload.php"
-        cacheTokens="false"
+        bootstrap="vendor/autoload.php"
         colors="true"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        forceCoversAnnotation="false"
-        mapTestClassNameToCoveredClassName="false"
-        processIsolation="false"
-        stopOnError="false"
-        stopOnFailure="false"
-        stopOnIncomplete="false"
-        stopOnSkipped="false"
-        stopOnRisky="false"
-        testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader"
-        timeoutForSmallTests="1"
-        timeoutForMediumTests="10"
-        timeoutForLargeTests="60"
         verbose="true"
 >
     <php>
@@ -31,23 +14,17 @@
 
     <testsuites>
         <testsuite name="Meritoo Package - Main Test Suite">
-            <directory>./tests/</directory>
+            <directory>tests/</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory>./src/</directory>
+            <directory>src/</directory>
         </whitelist>
     </filter>
 
-    <groups>
-        <exclude>
-            <group>performance</group>
-        </exclude>
-    </groups>
-
     <logging>
-        <log type="coverage-html" target="./build/logs/phpunit_coverage/html"/>
+        <log type="coverage-html" target="build/reports/phpunit_coverage/html"/>
     </logging>
 </phpunit>

src/Collection/Collection.php

@@ -9,10 +9,9 @@
 namespace Meritoo\Common\Collection;
 
 use ArrayAccess;
-use ArrayIterator;
 use Countable;
 use IteratorAggregate;
-use Meritoo\Common\Utilities\Arrays;
+use Meritoo\Common\Traits\CollectionTrait;
 
 /**
  * Collection of elements.
@@ -23,12 +22,7 @@ use Meritoo\Common\Utilities\Arrays;
  */
 class Collection implements Countable, ArrayAccess, IteratorAggregate
 {
-    /**
-     * The elements of collection
-     *
-     * @var array
-     */
-    private $elements;
+    use CollectionTrait;
 
     /**
      * Class constructor
@@ -39,246 +33,4 @@ class Collection implements Countable, ArrayAccess, IteratorAggregate
     {
         $this->elements = $elements;
     }
-
-    /**
-     * {@inheritdoc}
-     * Required by interface Countable
-     */
-    public function count()
-    {
-        return count($this->elements);
-    }
-
-    /**
-     * {@inheritdoc}
-     * Required by interface ArrayAccess
-     */
-    public function offsetExists($offset)
-    {
-        return $this->exists($offset);
-    }
-
-    /**
-     * {@inheritdoc}
-     * Required by interface ArrayAccess
-     */
-    public function offsetGet($offset)
-    {
-        if ($this->exists($offset)) {
-            return $this->elements[$offset];
-        }
-
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     * Required by interface ArrayAccess
-     */
-    public function offsetSet($offset, $value)
-    {
-        $this->elements[$offset] = $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     * Required by interface ArrayAccess
-     */
-    public function offsetUnset($offset)
-    {
-        if ($this->exists($offset)) {
-            unset($this->elements[$offset]);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     * Required by interface IteratorAggregate
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->elements);
-    }
-
-    /**
-     * Adds given element (at the end of collection)
-     *
-     * @param mixed $element The element to add
-     * @param mixed $index   (optional) Index / key of the element
-     * @return $this
-     */
-    public function add($element, $index = null)
-    {
-        if (null === $index || '' === $index) {
-            $this->elements[] = $element;
-        } else {
-            $this->elements[$index] = $element;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds given elements (at the end of collection)
-     *
-     * @param array|Collection $elements   The elements to add
-     * @param bool|false       $useIndexes (optional) If is set to true, indexes of given elements will be used in
-     *                                     this collection. Otherwise - not.
-     * @return $this
-     */
-    public function addMultiple($elements, $useIndexes = false)
-    {
-        if (!empty($elements)) {
-            foreach ($elements as $index => $element) {
-                if (!$useIndexes) {
-                    $index = null;
-                }
-
-                $this->add($element, $index);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Prepends given element (adds given element at the beginning of collection)
-     *
-     * @param mixed $element The element to prepend
-     * @return $this
-     */
-    public function prepend($element)
-    {
-        array_unshift($this->elements, $element);
-
-        return $this;
-    }
-
-    /**
-     * Removes given element
-     *
-     * @param mixed $element The element to remove
-     * @return $this
-     */
-    public function remove($element)
-    {
-        if ($this->count() > 0) {
-            foreach ($this->elements as $index => $existing) {
-                if ($element === $existing) {
-                    unset($this->elements[$index]);
-                    break;
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns information if collection is empty
-     *
-     * @return bool
-     */
-    public function isEmpty()
-    {
-        return empty($this->elements);
-    }
-
-    /**
-     * Returns information if given element is first in the collection
-     *
-     * @param mixed $element The element to verify
-     * @return bool
-     */
-    public function isFirst($element)
-    {
-        return reset($this->elements) === $element;
-    }
-
-    /**
-     * Returns information if given element is last in the collection
-     *
-     * @param mixed $element The element to verify
-     * @return bool
-     */
-    public function isLast($element)
-    {
-        return end($this->elements) === $element;
-    }
-
-    /**
-     * Returns information if the collection has given element, iow. if given element exists in the collection
-     *
-     * @param mixed $element The element to verify
-     * @return bool
-     */
-    public function has($element)
-    {
-        $index = Arrays::getIndexOf($this->elements, $element);
-
-        return null !== $index && false !== $index;
-    }
-
-    /**
-     * Returns previous element for given element
-     *
-     * @param mixed $element The element to verify
-     * @return mixed|null
-     */
-    public function getPrevious($element)
-    {
-        return Arrays::getPreviousElement($this->elements, $element);
-    }
-
-    /**
-     * Returns next element for given element
-     *
-     * @param mixed $element The element to verify
-     * @return mixed|null
-     */
-    public function getNext($element)
-    {
-        return Arrays::getNextElement($this->elements, $element);
-    }
-
-    /**
-     * Returns the first element in the collection
-     *
-     * @return mixed
-     */
-    public function getFirst()
-    {
-        return Arrays::getFirstElement($this->elements);
-    }
-
-    /**
-     * Returns the last element in the collection
-     *
-     * @return mixed
-     */
-    public function getLast()
-    {
-        return Arrays::getLastElement($this->elements);
-    }
-
-    /**
-     * Returns an array representation of the collection
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return $this->elements;
-    }
-
-    /**
-     * Returns information if element with given index/key exists
-     *
-     * @param string|int $index The index/key of element
-     * @return bool
-     */
-    private function exists($index)
-    {
-        return isset($this->elements[$index]) || array_key_exists($index, $this->elements);
-    }
 }

src/Exception/Base/UnknownTypeException.php

@@ -23,9 +23,9 @@ abstract class UnknownTypeException extends Exception
     /**
      * Creates exception
      *
-     * @param string|int $unknownType  The unknown type of something (value of constant)
-     * @param BaseType   $typeInstance An instance of class that contains type of the something
-     * @param string     $typeName     Name of the something
+     * @param mixed    $unknownType  The unknown type of something (value of constant)
+     * @param BaseType $typeInstance An instance of class that contains type of the something
+     * @param string   $typeName     Name of the something
      * @return UnknownTypeException
      */
     public static function create($unknownType, BaseType $typeInstance, $typeName)
@@ -35,7 +35,7 @@ abstract class UnknownTypeException extends Exception
 
         $allTypes = $typeInstance->getAll();
         $types = Arrays::values2string($allTypes, '', ', ');
-        $message = sprintf(sprintf($template, $unknownType, $typeName, $types));
+        $message = sprintf($template, $unknownType, $typeName, $types);
 
         return new static($message);
     }

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/Exception/Reflection/NotExistingPropertyException.php

@@ -0,0 +1,33 @@
+<?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\Exception\Reflection;
+
+/**
+ * An exception used while property does not exist in instance of class
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+class NotExistingPropertyException extends \Exception
+{
+    /**
+     * Creates exception
+     *
+     * @param mixed  $object   Object that should contains given property
+     * @param string $property Name of the property
+     * @return NotExistingPropertyException
+     */
+    public static function create($object, $property)
+    {
+        $template = 'Property \'%s\' does not exist in instance of class \'%s\'. Did you use proper name of property?';
+        $message = sprintf($template, $property, get_class($object));
+
+        return new static($message);
+    }
+}

src/Exception/ValueObject/InvalidSizeDimensionsException.php

@@ -0,0 +1,33 @@
+<?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\Exception\ValueObject;
+
+/**
+ * An exception used while dimensions of size, passed to the instance of Size class, are invalid
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+class InvalidSizeDimensionsException extends \Exception
+{
+    /**
+     * Creates exception
+     *
+     * @param int $width  The width
+     * @param int $height The height
+     * @return InvalidSizeDimensionsException
+     */
+    public static function create($width, $height)
+    {
+        $template = 'Dimensions of size should be positive, but they are not: %d, %d. Is there everything ok?';
+        $message = sprintf($template, $width, $height);
+
+        return new static($message);
+    }
+}

src/Traits/Collection/ArrayAccessTrait.php

@@ -0,0 +1,67 @@
+<?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\Traits\Collection;
+
+/**
+ * Trait for the Collection required by ArrayAccess interface
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+trait ArrayAccessTrait
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetExists($offset)
+    {
+        return $this->exists($offset);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetGet($offset)
+    {
+        if ($this->exists($offset)) {
+            return $this->elements[$offset];
+        }
+
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->elements[$offset] = $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetUnset($offset)
+    {
+        if ($this->exists($offset)) {
+            unset($this->elements[$offset]);
+        }
+    }
+
+    /**
+     * Returns information if element with given index/key exists
+     *
+     * @param string|int $index The index/key of element
+     * @return bool
+     */
+    private function exists($index)
+    {
+        return isset($this->elements[$index]) || array_key_exists($index, $this->elements);
+    }
+}

src/Traits/Collection/CountableTrait.php

@@ -0,0 +1,26 @@
+<?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\Traits\Collection;
+
+/**
+ * Trait for the Collection required by Countable interface
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+trait CountableTrait
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function count()
+    {
+        return count($this->elements);
+    }
+}

src/Traits/Collection/IteratorAggregateTrait.php

@@ -0,0 +1,28 @@
+<?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\Traits\Collection;
+
+use ArrayIterator;
+
+/**
+ * Trait for the Collection required by IteratorAggregate interface
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+trait IteratorAggregateTrait
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getIterator()
+    {
+        return new ArrayIterator($this->elements);
+    }
+}

src/Traits/Collection/MainTrait.php

@@ -0,0 +1,215 @@
+<?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\Traits\Collection;
+
+use Meritoo\Common\Collection\Collection;
+use Meritoo\Common\Utilities\Arrays;
+
+/**
+ * Main trait for the Collection
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+trait MainTrait
+{
+    /**
+     * The elements of collection
+     *
+     * @var array
+     */
+    private $elements;
+
+    /**
+     * Adds given element (at the end of collection)
+     *
+     * @param mixed $element The element to add
+     * @param mixed $index   (optional) Index / key of the element
+     * @return $this
+     */
+    public function add($element, $index = null)
+    {
+        if (null === $index || '' === $index) {
+            $this->elements[] = $element;
+        } else {
+            $this->elements[$index] = $element;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Adds given elements (at the end of collection)
+     *
+     * @param array|Collection $elements   The elements to add
+     * @param bool|false       $useIndexes (optional) If is set to true, indexes of given elements will be used in
+     *                                     this collection. Otherwise - not.
+     * @return $this
+     */
+    public function addMultiple($elements, $useIndexes = false)
+    {
+        if (!empty($elements)) {
+            foreach ($elements as $index => $element) {
+                if ($useIndexes) {
+                    $this->add($element, $index);
+                    continue;
+                }
+
+                $this->add($element);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Prepends given element (adds given element at the beginning of collection)
+     *
+     * @param mixed $element The element to prepend
+     * @return $this
+     */
+    public function prepend($element)
+    {
+        array_unshift($this->elements, $element);
+
+        return $this;
+    }
+
+    /**
+     * Removes given element
+     *
+     * @param mixed $element The element to remove
+     * @return $this
+     */
+    public function remove($element)
+    {
+        if ($this->count() > 0) {
+            foreach ($this->elements as $index => $existing) {
+                if ($element === $existing) {
+                    unset($this->elements[$index]);
+                    break;
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns information if collection is empty
+     *
+     * @return bool
+     */
+    public function isEmpty()
+    {
+        return empty($this->elements);
+    }
+
+    /**
+     * Returns information if given element is first in the collection
+     *
+     * @param mixed $element The element to verify
+     * @return bool
+     */
+    public function isFirst($element)
+    {
+        return reset($this->elements) === $element;
+    }
+
+    /**
+     * Returns information if given element is last in the collection
+     *
+     * @param mixed $element The element to verify
+     * @return bool
+     */
+    public function isLast($element)
+    {
+        return end($this->elements) === $element;
+    }
+
+    /**
+     * Returns information if the collection has given element, iow. if given element exists in the collection
+     *
+     * @param mixed $element The element to verify
+     * @return bool
+     */
+    public function has($element)
+    {
+        $index = Arrays::getIndexOf($this->elements, $element);
+
+        return null !== $index && false !== $index;
+    }
+
+    /**
+     * Returns previous element for given element
+     *
+     * @param mixed $element The element to verify
+     * @return mixed|null
+     */
+    public function getPrevious($element)
+    {
+        return Arrays::getPreviousElement($this->elements, $element);
+    }
+
+    /**
+     * Returns next element for given element
+     *
+     * @param mixed $element The element to verify
+     * @return mixed|null
+     */
+    public function getNext($element)
+    {
+        return Arrays::getNextElement($this->elements, $element);
+    }
+
+    /**
+     * Returns the first element in the collection
+     *
+     * @return mixed
+     */
+    public function getFirst()
+    {
+        return Arrays::getFirstElement($this->elements);
+    }
+
+    /**
+     * Returns the last element in the collection
+     *
+     * @return mixed
+     */
+    public function getLast()
+    {
+        return Arrays::getLastElement($this->elements);
+    }
+
+    /**
+     * Returns element with given index
+     *
+     * @param mixed $index Index / key of the element
+     * @return mixed|null
+     */
+    public function getByIndex($index)
+    {
+        if (isset($this->elements[$index])) {
+            return $this->elements[$index];
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns representation of object as array
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        return $this->elements;
+    }
+}

src/Traits/CollectionTrait.php

@@ -0,0 +1,28 @@
+<?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\Traits;
+
+use Meritoo\Common\Traits\Collection\ArrayAccessTrait;
+use Meritoo\Common\Traits\Collection\CountableTrait;
+use Meritoo\Common\Traits\Collection\IteratorAggregateTrait;
+use Meritoo\Common\Traits\Collection\MainTrait;
+
+/**
+ * Trait for the Collection
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+trait CollectionTrait
+{
+    use MainTrait;
+    use CountableTrait;
+    use ArrayAccessTrait;
+    use IteratorAggregateTrait;
+}

src/Traits/CssSelector/FormCssSelector.php

@@ -0,0 +1,110 @@
+<?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\Traits\CssSelector;
+
+/**
+ * Useful methods related to CSS selectors of form
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+trait FormCssSelector
+{
+    /**
+     * Returns selector of form based on its name
+     *
+     * @param string $formName Name of form (value of the "name" attribute)
+     * @return string
+     */
+    public static function getFormByNameSelector($formName)
+    {
+        $formName = trim($formName);
+
+        if (empty($formName)) {
+            return '';
+        }
+
+        return sprintf('form[name="%s"]', $formName);
+    }
+
+    /**
+     * Returns selector of the input field based on its name
+     *
+     * @param string $formName  Name of form (value of the "name" attribute)
+     * @param string $fieldName Name of field (value of the "name" attribute)
+     * @return string
+     */
+    public static function getInputByNameSelector($formName, $fieldName)
+    {
+        $formSelector = static::getFormByNameSelector($formName);
+        $fieldName = trim($fieldName);
+
+        if (empty($formSelector) || empty($fieldName)) {
+            return '';
+        }
+
+        return sprintf('%s input[name="%s"]', $formSelector, $fieldName);
+    }
+
+    /**
+     * Returns selector of the input field based on its ID
+     *
+     * @param string $formName Name of form (value of the "name" attribute)
+     * @param string $fieldId  ID of field (value of the "id" attribute)
+     * @return string
+     */
+    public static function getInputByIdSelector($formName, $fieldId)
+    {
+        $formSelector = static::getFormByNameSelector($formName);
+        $fieldId = trim($fieldId);
+
+        if (empty($formSelector) || empty($fieldId)) {
+            return '';
+        }
+
+        return sprintf('%s input#%s', $formSelector, $fieldId);
+    }
+
+    /**
+     * Returns selector of label
+     *
+     * @param string $formName Name of form (value of the "name" attribute)
+     * @param string $fieldId  ID of field (value of the "id" attribute)
+     * @return string
+     */
+    public static function getLabelSelector($formName, $fieldId)
+    {
+        $formSelector = static::getFormByNameSelector($formName);
+        $fieldId = trim($fieldId);
+
+        if (empty($formSelector) || empty($fieldId)) {
+            return '';
+        }
+
+        return sprintf('%s label[for="%s"]', $formSelector, $fieldId);
+    }
+
+    /**
+     * Returns selector of field-set using index/position of the field-set
+     *
+     * @param string $formName      Name of form (value of the "name" attribute)
+     * @param int    $fieldSetIndex Index/Position of the field-set
+     * @return string
+     */
+    public static function getFieldSetByIndexSelector($formName, $fieldSetIndex)
+    {
+        $formSelector = static::getFormByNameSelector($formName);
+
+        if (empty($formSelector) || 0 > $fieldSetIndex) {
+            return '';
+        }
+
+        return sprintf('%s fieldset:nth-of-type(%d)', $formSelector, $fieldSetIndex);
+    }
+}

src/Traits/Test/Base/BaseTestCaseTrait.php

@@ -14,13 +14,11 @@ use Meritoo\Common\Exception\Type\UnknownOopVisibilityTypeException;
 use Meritoo\Common\Type\OopVisibilityType;
 use Meritoo\Common\Utilities\Miscellaneous;
 use ReflectionClass;
-use ReflectionException;
 use ReflectionMethod;
 use stdClass;
 
 /**
- * BaseTestCaseTrait
- * Created on 2017-11-02
+ * Trait for the base test case
  *
  * @author    Meritoo <github@meritoo.pl>
  * @copyright Meritoo <http://www.meritoo.pl>
@@ -49,6 +47,20 @@ trait BaseTestCaseTrait
         yield[[]];
     }
 
+    /**
+     * Provides an empty scalar value
+     *
+     * @return Generator
+     */
+    public function provideEmptyScalarValue()
+    {
+        yield[''];
+        yield['   '];
+        yield[null];
+        yield[0];
+        yield[false];
+    }
+
     /**
      * Provides boolean value
      *
@@ -159,7 +171,6 @@ trait BaseTestCaseTrait
      * @param int                     $requiredArgumentsCount (optional) Expected count/amount of required arguments
      *                                                        of the verified method
      * @throws UnknownOopVisibilityTypeException
-     * @throws ReflectionException
      *
      * Attention. 2nd argument, the $method, may be:
      * - string - name of the method
@@ -216,8 +227,6 @@ trait BaseTestCaseTrait
      * @param int    $argumentsCount         (optional) Expected count/amount of arguments of the verified method
      * @param int    $requiredArgumentsCount (optional) Expected count/amount of required arguments of the verified
      *                                       method
-     * @throws ReflectionException
-     * @throws UnknownOopVisibilityTypeException
      */
     protected static function assertConstructorVisibilityAndArguments(
         $classNamespace,
@@ -231,14 +240,19 @@ trait BaseTestCaseTrait
         $reflection = new ReflectionClass($classNamespace);
         $method = $reflection->getConstructor();
 
-        static::assertMethodVisibilityAndArguments($classNamespace, $method, $visibilityType, $argumentsCount, $requiredArgumentsCount);
+        static::assertMethodVisibilityAndArguments(
+            $classNamespace,
+            $method,
+            $visibilityType,
+            $argumentsCount,
+            $requiredArgumentsCount
+        );
     }
 
     /**
      * Asserts that class with given namespace has no constructor
      *
      * @param string $classNamespace Namespace of class that contains constructor to verify
-     * @throws ReflectionException
      */
     protected static function assertHasNoConstructor($classNamespace)
     {

src/Traits/ValueObject/HumanTrait.php

@@ -0,0 +1,137 @@
+<?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\Traits\ValueObject;
+
+/**
+ * Methods and properties related to human
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+trait HumanTrait
+{
+    /**
+     * First name
+     *
+     * @var string
+     */
+    protected $firstName;
+
+    /**
+     * Last name
+     *
+     * @var string
+     */
+    protected $lastName;
+
+    /**
+     * Email address
+     *
+     * @var string
+     */
+    protected $email;
+
+    /**
+     * Birth date
+     *
+     * @var \DateTime
+     */
+    protected $birthDate;
+
+    /**
+     * Class constructor
+     *
+     * @param string    $firstName First name
+     * @param string    $lastName  Last name
+     * @param string    $email     (optional) Email address
+     * @param \DateTime $birthDate (optional) Birth date
+     */
+    public function __construct($firstName, $lastName, $email = null, \DateTime $birthDate = null)
+    {
+        $this->firstName = $firstName;
+        $this->lastName = $lastName;
+        $this->email = $email;
+        $this->birthDate = $birthDate;
+    }
+
+    /**
+     * Returns representation of object as string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        $template = '%s';
+
+        if ('' !== $this->email && null !== $this->email) {
+            $template .= ' <%s>';
+        }
+
+        return sprintf($template, $this->getFullName(), $this->email);
+    }
+
+    /**
+     * Returns first name
+     *
+     * @return string
+     */
+    public function getFirstName()
+    {
+        return $this->firstName;
+    }
+
+    /**
+     * Returns last name
+     *
+     * @return string
+     */
+    public function getLastName()
+    {
+        return $this->lastName;
+    }
+
+    /**
+     * Returns email address
+     *
+     * @return string|null
+     */
+    public function getEmail()
+    {
+        return $this->email;
+    }
+
+    /**
+     * Returns birth date
+     *
+     * @return \DateTime|null
+     */
+    public function getBirthDate()
+    {
+        return $this->birthDate;
+    }
+
+    /**
+     * Returns the full name
+     *
+     * @param bool $firstNameFirst (optional) If is set to true, first name is the first part. Otherwise - last name.
+     * @return string
+     */
+    public function getFullName($firstNameFirst = true)
+    {
+        $beginning = $this->lastName;
+        $finish = $this->firstName;
+
+        if ($firstNameFirst) {
+            $beginning = $this->firstName;
+            $finish = $this->lastName;
+        }
+
+        return trim(sprintf('%s %s', $beginning, $finish));
+    }
+}

src/Type/Base/BaseType.php

@@ -43,7 +43,7 @@ abstract class BaseType
     /**
      * Returns information if given type is correct
      *
-     * @param string $type The type to check
+     * @param mixed $type The type to check
      * @return bool
      */
     public function isCorrectType($type)

src/Utilities/Bootstrap4CssSelector.php

@@ -0,0 +1,85 @@
+<?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\Utilities;
+
+/**
+ * Useful methods related to CSS selectors and the Bootstrap4 (front-end component library)
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+class Bootstrap4CssSelector
+{
+    /**
+     * Returns selector of container with field's validation error
+     *
+     * @return string
+     */
+    public static function getFieldErrorContainerSelector()
+    {
+        return '.invalid-feedback .form-error-message';
+    }
+
+    /**
+     * Returns selector of field's validation error
+     *
+     * @param string $formName Name of form (value of the "name" attribute)
+     * @param string $fieldId  ID of field (value of the "id" attribute)
+     * @return string
+     */
+    public static function getFieldErrorSelector($formName, $fieldId)
+    {
+        $labelSelector = CssSelector::getLabelSelector($formName, $fieldId);
+
+        if (empty($labelSelector)) {
+            return '';
+        }
+
+        $errorContainerSelector = static::getFieldErrorContainerSelector();
+
+        return sprintf('%s %s', $labelSelector, $errorContainerSelector);
+    }
+
+    /**
+     * Returns selector of radio-button's validation error
+     *
+     * @param string $formName      Name of form (value of the "name" attribute)
+     * @param int    $fieldSetIndex Index/Position of the field-set
+     * @return string
+     */
+    public static function getRadioButtonErrorSelector($formName, $fieldSetIndex)
+    {
+        $fieldSetSelector = CssSelector::getFieldSetByIndexSelector($formName, $fieldSetIndex);
+
+        if (empty($fieldSetSelector)) {
+            return '';
+        }
+
+        $errorContainerSelector = static::getFieldErrorContainerSelector();
+
+        return sprintf('%s legend.col-form-label %s', $fieldSetSelector, $errorContainerSelector);
+    }
+
+    /**
+     * Returns selector of field's group
+     *
+     * @param string $formName Name of form (value of the "name" attribute)
+     * @return string
+     */
+    public static function getFieldGroupSelector($formName)
+    {
+        $formSelector = CssSelector::getFormByNameSelector($formName);
+
+        if (empty($formSelector)) {
+            return '';
+        }
+
+        return sprintf('%s .form-group', $formSelector);
+    }
+}

src/Utilities/CssSelector.php

@@ -0,0 +1,22 @@
+<?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\Utilities;
+
+use Meritoo\Common\Traits\CssSelector\FormCssSelector;
+
+/**
+ * Useful methods related to CSS selectors
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+class CssSelector
+{
+    use FormCssSelector;
+}

src/Utilities/Date.php

@@ -64,8 +64,7 @@ class Date
     const DATE_DIFFERENCE_UNIT_YEARS = 'years';
 
     /**
-     * Returns start and end date for given period.
-     * The dates are returned in an array with indexes 'start' and 'end'.
+     * Returns date's period (that contains start and end date) for given period
      *
      * @param int $period The period, type of period. One of DatePeriod class constants, e.g. DatePeriod::LAST_WEEK.
      * @throws Exception
@@ -119,11 +118,15 @@ class Date
                 $lastMonth = self::getDatesForPeriod(DatePeriod::LAST_MONTH);
                 $nextMonth = self::getDatesForPeriod(DatePeriod::NEXT_MONTH);
 
-                $dateStart = $lastMonth->getEndDate();
-                $dateStart->add(new DateInterval('P1D'));
+                if (null !== $lastMonth) {
+                    $dateStart = $lastMonth->getEndDate();
+                    $dateStart->add(new DateInterval('P1D'));
+                }
 
-                $dateEnd = $nextMonth->getStartDate();
-                $dateEnd->sub(new DateInterval('P1D'));
+                if (null !== $nextMonth) {
+                    $dateEnd = $nextMonth->getStartDate();
+                    $dateEnd->sub(new DateInterval('P1D'));
+                }
 
                 break;
             case DatePeriod::NEXT_MONTH:
@@ -137,10 +140,15 @@ 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) {
+                    if (DatePeriod::LAST_YEAR === $period) {
                         $yearDifference *= -1;
                     }
 
@@ -164,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);
@@ -214,13 +222,13 @@ class Date
 
         return $dateTime
             ->setTime($hour, $minute, $second)
-            ->format($format);
+            ->format($format)
+            ;
     }
 
     /**
      * Returns current day of week
      *
-     * @throws UnknownDatePartTypeException
      * @return int
      */
     public static function getCurrentDayOfWeek()
@@ -347,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
@@ -368,11 +376,11 @@ class Date
             return null;
         }
 
-        $dateStart = self::getDateTime($dateStart, true);
-        $dateEnd = self::getDateTime($dateEnd, true);
+        $start = self::getDateTime($dateStart, true);
+        $end = self::getDateTime($dateEnd, true);
 
         $difference = [];
-        $dateDiff = $dateEnd->getTimestamp() - $dateStart->getTimestamp();
+        $dateDiff = $end->getTimestamp() - $start->getTimestamp();
 
         $daysInSeconds = 0;
         $hoursInSeconds = 0;
@@ -390,39 +398,39 @@ class Date
             self::DATE_DIFFERENCE_UNIT_MINUTES,
         ];
 
-        if (null === $differenceUnit || self::DATE_DIFFERENCE_UNIT_YEARS == $differenceUnit) {
-            $diff = $dateEnd->diff($dateStart);
+        if (null === $differenceUnit || self::DATE_DIFFERENCE_UNIT_YEARS === $differenceUnit) {
+            $diff = $end->diff($start);
 
             /*
              * Difference between dates in years should be returned only?
              */
-            if (self::DATE_DIFFERENCE_UNIT_YEARS == $differenceUnit) {
+            if (self::DATE_DIFFERENCE_UNIT_YEARS === $differenceUnit) {
                 return $diff->y;
             }
 
             $difference[self::DATE_DIFFERENCE_UNIT_YEARS] = $diff->y;
         }
 
-        if (null === $differenceUnit || self::DATE_DIFFERENCE_UNIT_MONTHS == $differenceUnit) {
-            $diff = $dateEnd->diff($dateStart);
+        if (null === $differenceUnit || self::DATE_DIFFERENCE_UNIT_MONTHS === $differenceUnit) {
+            $diff = $end->diff($start);
 
             /*
              * Difference between dates in months should be returned only?
              */
-            if (self::DATE_DIFFERENCE_UNIT_MONTHS == $differenceUnit) {
+            if (self::DATE_DIFFERENCE_UNIT_MONTHS === $differenceUnit) {
                 return $diff->m;
             }
 
             $difference[self::DATE_DIFFERENCE_UNIT_MONTHS] = $diff->m;
         }
 
-        if (null === $differenceUnit || in_array($differenceUnit, $relatedUnits)) {
+        if (null === $differenceUnit || in_array($differenceUnit, $relatedUnits, true)) {
             $days = (int)floor($dateDiff / $daySeconds);
 
             /*
              * Difference between dates in days should be returned only?
              */
-            if (self::DATE_DIFFERENCE_UNIT_DAYS == $differenceUnit) {
+            if (self::DATE_DIFFERENCE_UNIT_DAYS === $differenceUnit) {
                 return $days;
             }
 
@@ -439,13 +447,13 @@ class Date
             $daysInSeconds = $days * $daySeconds;
         }
 
-        if (null === $differenceUnit || in_array($differenceUnit, $relatedUnits)) {
+        if (null === $differenceUnit || in_array($differenceUnit, $relatedUnits, true)) {
             $hours = (int)floor(($dateDiff - $daysInSeconds) / $hourSeconds);
 
             /*
              * Difference between dates in hours should be returned only?
              */
-            if (self::DATE_DIFFERENCE_UNIT_HOURS == $differenceUnit) {
+            if (self::DATE_DIFFERENCE_UNIT_HOURS === $differenceUnit) {
                 return $hours;
             }
 
@@ -462,13 +470,13 @@ class Date
             $hoursInSeconds = $hours * $hourSeconds;
         }
 
-        if (null === $differenceUnit || self::DATE_DIFFERENCE_UNIT_MINUTES == $differenceUnit) {
+        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 (self::DATE_DIFFERENCE_UNIT_MINUTES == $differenceUnit) {
+            if (self::DATE_DIFFERENCE_UNIT_MINUTES === $differenceUnit) {
                 return $minutes;
             }
 
@@ -528,11 +536,15 @@ class Date
     /**
      * Returns random date based on given start date
      *
-     * @param DateTime $startDate        The start date. Start of the random date.
-     * @param int      $start            (optional) Start of random partition
-     * @param int      $end              (optional) End of random partition
+     * @param DateTime $startDate        (optional) Beginning of the random date. If not provided, current date will
+     *                                   be used (default behaviour).
+     * @param int      $start            (optional) Start of random partition. If not provided, 1 will be used
+     *                                   (default behaviour).
+     * @param int      $end              (optional) End of random partition. If not provided, 100 will be used
+     *                                   (default behaviour).
      * @param string   $intervalTemplate (optional) Template used to build date interval. The placeholder is replaced
-     *                                   with next, iterated value.
+     *                                   with next, iterated value. If not provided, "P%sD" will be used (default
+     *                                   behaviour).
      * @throws Exception
      * @return DateTime
      */
@@ -554,7 +566,7 @@ class Date
         }
 
         $randomDate = clone $startDate;
-        $randomInterval = new DateInterval(sprintf($intervalTemplate, rand($start, $end)));
+        $randomInterval = new DateInterval(sprintf($intervalTemplate, mt_rand($start, $end)));
 
         return $randomDate->add($randomInterval);
     }
@@ -566,10 +578,11 @@ class Date
      * @param mixed  $value                The value which maybe is a date
      * @param bool   $allowCompoundFormats (optional) If is set to true, the compound formats used to create an
      *                                     instance of DateTime class are allowed (e.g. "now", "last day of next
-     *                                     month", "yyyy"). Otherwise - not and every incorrect value is refused.
+     *                                     month", "yyyy"). Otherwise - not and every incorrect value is refused
+     *                                     (default behaviour).
      * @param string $dateFormat           (optional) Format of date used to verify if given value is actually a date.
      *                                     It should be format matched to the given value, e.g. "Y-m-d H:i" for
-     *                                     "2015-01-01 10:00" value.
+     *                                     "2015-01-01 10:00" value. Default: "Y-m-d".
      * @return DateTime|bool
      */
     public static function getDateTime($value, $allowCompoundFormats = false, $dateFormat = 'Y-m-d')
@@ -637,7 +650,7 @@ class Date
                          * So, I have to refuse those special compound formats if they are not explicitly declared as
                          * compound (2nd argument of this method, set to false by default)
                          */
-                        if (in_array($value, $specialFormats)) {
+                        if (in_array($value, $specialFormats, true)) {
                             return false;
                         }
                     }
@@ -662,7 +675,7 @@ class Date
              */
             $dateString = (new DateTime())->format($value);
 
-            if ($dateString != $value) {
+            if ($dateString !== (string)$value) {
                 return new DateTime($dateString);
             }
         } catch (\Exception $exception) {
@@ -706,7 +719,7 @@ class Date
          * Formatted date it's the format who is validated?
          * The format is invalid
          */
-        if ($formatted == $format) {
+        if ($formatted === $format) {
             return false;
         }
 

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

@@ -9,8 +9,6 @@
 namespace Meritoo\Common\Utilities;
 
 use Gedmo\Sluggable\Util\Urlizer;
-use Meritoo\Common\Exception\Regex\IncorrectColorHexLengthException;
-use Meritoo\Common\Exception\Regex\InvalidColorHexValueException;
 use Transliterator;
 
 /**
@@ -62,15 +60,15 @@ class Miscellaneous
             $startFileName = mb_substr($startFileName, 1);
         }
 
-        $directoryContent = scandir($directoryPath);
+        $directoryContent = scandir($directoryPath, SCANDIR_SORT_ASCENDING);
 
         if (!empty($directoryContent)) {
             foreach ($directoryContent as $fileName) {
-                if ('.' != $fileName && '..' != $fileName) {
+                if ('.' !== $fileName && '..' !== $fileName) {
                     $content = null;
 
                     if (!empty($startFileName) && !$startFileFound) {
-                        if ($fileName == $startFileName) {
+                        if ($fileName === $startFileName) {
                             $startFileFound = true;
                         }
 
@@ -84,18 +82,18 @@ class Miscellaneous
                     if (null !== $content) {
                         $files[$fileName] = $content;
 
-                        if (!empty($maxFilesCount)) {
+                        if (null !== $maxFilesCount) {
                             $count += Arrays::getNonArrayElementsCount($content);
                         }
                     } else {
                         $files[] = $fileName;
 
-                        if (!empty($maxFilesCount)) {
+                        if (null !== $maxFilesCount) {
                             ++$count;
                         }
                     }
 
-                    if (!empty($maxFilesCount) && $count >= $maxFilesCount) {
+                    if (null !== $maxFilesCount && $count >= $maxFilesCount) {
                         break;
                     }
                 }
@@ -160,11 +158,17 @@ class Miscellaneous
      */
     public static function includeFileExtension($fileName, $extension)
     {
-        if (self::getFileExtension($fileName, true) != strtolower($extension)) {
-            return sprintf('%s.%s', $fileName, $extension);
+        $fileExtension = self::getFileExtension($fileName, true);
+
+        /*
+         * File has given extension?
+         * Nothing to do
+         */
+        if ($fileExtension === strtolower($extension)) {
+            return $fileName;
         }
 
-        return $fileName;
+        return sprintf('%s.%s', $fileName, $extension);
     }
 
     /**
@@ -229,31 +233,28 @@ class Miscellaneous
         /*
          * Let's clear name of file
          *
-         * Attention. The name without extension may be cleared / urlized only
-         * to avoid incorrect name by replacing "." with "-".
+         * Attention.
+         * The name without extension may be cleared / urlized only to avoid incorrect name by replacing "." with "-".
          */
         $withoutExtension = Urlizer::urlize($withoutExtension);
 
         /*
          * Now I have to complete the template used to build / generate unique name
          */
-        $template = '%s-%s'; // file's name and unique key
-
-        if ($objectId > 0) {
-            $template .= '-%s'; // object ID
-        }
-
-        $template .= '.%s'; // file's extension
+        $template = '%s-%s.%s'; // [file's name]-[unique key].[file's extension]
 
         /*
          * Add some uniqueness
          */
-        $unique = uniqid(mt_rand(), true);
+        $unique = self::getUniqueString(mt_rand());
 
         /*
          * Finally build and return the unique name
          */
+
         if ($objectId > 0) {
+            $template = '%s-%s-%s.%s'; // [file's name]-[unique key]-[object ID].[file's extension]
+
             return sprintf($template, $withoutExtension, $unique, $objectId, $extension);
         }
 
@@ -295,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
      *
@@ -333,7 +306,7 @@ class Miscellaneous
     {
         $phpModulesArray = get_loaded_extensions();
 
-        return in_array($phpModuleName, $phpModulesArray);
+        return in_array($phpModuleName, $phpModulesArray, false);
     }
 
     /**
@@ -452,6 +425,14 @@ class Miscellaneous
      */
     public static function replace($subject, $search, $replacement, $quoteStrings = false)
     {
+        /*
+         * Unknown source or item to find or replacement is an empty array?
+         * Nothing to do
+         */
+        if (empty($subject) || empty($search) || [] === $replacement) {
+            return $subject;
+        }
+
         $effect = $subject;
 
         $searchIsString = is_string($search);
@@ -461,7 +442,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 && 0 == strlen($search))) {
+        if ((!$searchIsString && !$searchIsArray) || ($searchIsString && '' === $search)) {
             return $effect;
         }
 
@@ -471,40 +452,50 @@ class Miscellaneous
         $bothAreStrings = $searchIsString && $replacementIsString;
         $bothAreArrays = $searchIsArray && $replacementIsArray;
 
-        /*
-         * First step: replace strings, simple operation with strings
-         */
-        if ($searchIsString && $replacementIsString) {
-            if ($quoteStrings) {
+        if ($quoteStrings) {
+            if ($replacementIsString) {
                 $replacement = '\'' . $replacement . '\'';
-            }
+            } elseif ($replacementIsArray) {
+                foreach ($replacement as &$item) {
+                    if (is_string($item)) {
+                        $item = '\'' . $item . '\'';
+                    }
+                }
 
+                unset($item);
+            }
+        }
+
+        /*
+         * 1st step: replace strings, simple operation with strings
+         */
+        if ($bothAreStrings) {
             $effect = str_replace($search, $replacement, $subject);
         }
 
         /*
-         * Second step: replace with regular expressions.
+         * 2nd step: replace with regular expressions.
          * Attention. Searched and replacement value should be the same type: strings or arrays.
          */
-        if ($effect == $subject && ($bothAreStrings || $bothAreArrays)) {
-            if ($quoteStrings && $replacementIsString) {
-                $replacement = '\'' . $replacement . '\'';
-            }
-
+        if ($effect === $subject && ($bothAreStrings || $bothAreArrays)) {
             /*
              * I have to avoid string that contains spaces only, e.g. "  ".
              * It's required to avoid bug: preg_replace(): Empty regular expression.
              */
             if ($searchIsArray || ($searchIsString && !empty(trim($search)))) {
-                $effect = preg_replace($search, $replacement, $subject);
+                $replaced = @preg_replace($search, $replacement, $subject);
+
+                if (null !== $replaced && [] !== $replaced) {
+                    $effect = $replaced;
+                }
             }
         }
 
         /*
-         * Third step: complex replace of the replacement defined as an array.
+         * 3rd step: complex replace of the replacement defined as an array.
          * It may be useful when you want to search for a one string and replace the string with multiple values.
          */
-        if ($effect == $subject && $searchIsString && $replacementIsArray) {
+        if ($effect === $subject && $searchIsString && $replacementIsArray) {
             $subjectIsArray = is_array($subject);
             $effect = '';
 
@@ -527,16 +518,6 @@ class Miscellaneous
                 $exploded = explode($search, $subSubject);
                 $explodedCount = count($exploded);
 
-                if ($quoteStrings) {
-                    foreach ($replacement as &$item) {
-                        if (is_string($item)) {
-                            $item = '\'' . $item . '\'';
-                        }
-                    }
-
-                    unset($item);
-                }
-
                 foreach ($exploded as $key => $item) {
                     $subEffect .= $item;
 
@@ -589,7 +570,12 @@ class Miscellaneous
      */
     public static function getOperatingSystemNameServer()
     {
-        return php_uname('s');
+        return PHP_OS;
+
+        /*
+         * Previous version:
+         * return php_uname('s');
+         */
     }
 
     /**
@@ -681,7 +667,8 @@ class Miscellaneous
 
                     $spacePosition = mb_strrpos($lineWithAberration, ' ', 0, $encoding);
 
-                    if ($spacePosition > 0) {
+                    if (false !== $spacePosition && 0 < $spacePosition) {
+                        /* @var int $spacePosition */
                         $perLine = $spacePosition;
                         $insertSeparator = true;
                     }
@@ -738,8 +725,8 @@ class Miscellaneous
             return unlink($directoryPath);
         }
 
-        foreach (scandir($directoryPath) as $item) {
-            if ('.' == $item || '..' == $item) {
+        foreach (scandir($directoryPath, SCANDIR_SORT_ASCENDING) as $item) {
+            if ('.' === $item || '..' === $item) {
                 continue;
             }
 
@@ -788,7 +775,7 @@ class Miscellaneous
         foreach ($members as $key => $value) {
             $value = mb_strtolower($value);
 
-            if (0 == $key) {
+            if (0 === $key) {
                 $effect .= self::lowercaseFirst($value);
             } else {
                 $effect .= self::uppercaseFirst($value);
@@ -809,10 +796,6 @@ class Miscellaneous
      * - null (default): nothing is done with the string
      * - true: the rest of string is lowercased
      * - false: the rest of string is uppercased
-     *
-     * Some explanation:
-     * Function lcfirst() is available for PHP >= 5.30, so I wrote my own function that lowercases first character of
-     * the string.
      */
     public static function lowercaseFirst($text, $restLowercase = null)
     {
@@ -828,16 +811,7 @@ class Miscellaneous
             $effect = mb_strtoupper($effect);
         }
 
-        if (function_exists('lcfirst')) {
-            $effect = lcfirst($effect);
-        } else {
-            $first = mb_strtolower($effect[0]);
-            $rest = mb_substr($effect, 1);
-
-            $effect = $first . $rest;
-        }
-
-        return $effect;
+        return lcfirst($effect);
     }
 
     /**
@@ -866,16 +840,7 @@ class Miscellaneous
             $effect = mb_strtoupper($effect);
         }
 
-        if (function_exists('ucfirst')) {
-            $effect = ucfirst($effect);
-        } else {
-            $first = mb_strtoupper($effect[0]);
-            $rest = mb_substr($effect, 1);
-
-            $effect = $first . $rest;
-        }
-
-        return $effect;
+        return ucfirst($effect);
     }
 
     /**
@@ -916,9 +881,9 @@ class Miscellaneous
             'TB',
             'PB',
         ];
-        $index = floor(log($sizeInBytes, 1024));
 
-        $size = round($sizeInBytes / pow(1024, $index), 2);
+        $index = floor(log($sizeInBytes, 1024));
+        $size = round($sizeInBytes / (1024 ** $index), 2);
         $unit = $units[(int)$index];
 
         return sprintf('%s %s', $size, $unit);
@@ -1194,10 +1159,6 @@ class Miscellaneous
 
             if (null !== $globalSource && isset($globalSource[$variableName])) {
                 $value = $globalSource[$variableName];
-
-                if (!ini_get('magic_quotes_gpc')) {
-                    $value = addslashes($value);
-                }
             }
         }
 
@@ -1243,7 +1204,7 @@ class Miscellaneous
                 continue;
             }
 
-            $text = $text . '0';
+            $text .= '0';
         }
 
         return $text;
@@ -1298,8 +1259,8 @@ class Miscellaneous
         if ($asHexadecimal) {
             $hexadecimal = dechex($colorComponent);
 
-            if (1 == strlen($hexadecimal)) {
-                return sprintf('0%s', $hexadecimal, $hexadecimal);
+            if (1 === strlen($hexadecimal)) {
+                return sprintf('0%s', $hexadecimal);
             }
 
             return $hexadecimal;
@@ -1312,8 +1273,6 @@ class Miscellaneous
      * Returns inverted value of color for given color
      *
      * @param string $color Hexadecimal value of color to invert (with or without hash), e.g. "dd244c" or "#22a5fe"
-     * @throws IncorrectColorHexLengthException
-     * @throws InvalidColorHexValueException
      * @return string
      */
     public static function getInvertedColor($color)
@@ -1328,14 +1287,14 @@ class Miscellaneous
          * Verify and get valid value of color.
          * An exception will be thrown if the value is not a color.
          */
-        $color = Regex::getValidColorHexValue($color);
+        $validColor = Regex::getValidColorHexValue($color);
 
         /*
          * Grab color's components
          */
-        $red = hexdec(substr($color, 0, 2));
-        $green = hexdec(substr($color, 2, 2));
-        $blue = hexdec(substr($color, 4, 2));
+        $red = hexdec(substr($validColor, 0, 2));
+        $green = hexdec(substr($validColor, 2, 2));
+        $blue = hexdec(substr($validColor, 4, 2));
 
         /*
          * Calculate inverted color's components

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/Reflection.php

@@ -13,12 +13,8 @@ use Doctrine\Common\Util\Inflector;
 use Meritoo\Common\Collection\Collection;
 use Meritoo\Common\Exception\Reflection\CannotResolveClassNameException;
 use Meritoo\Common\Exception\Reflection\MissingChildClassesException;
+use Meritoo\Common\Exception\Reflection\NotExistingPropertyException;
 use Meritoo\Common\Exception\Reflection\TooManyChildClassesException;
-use ReflectionClass;
-use ReflectionException;
-use ReflectionMethod;
-use ReflectionObject;
-use ReflectionProperty;
 
 /**
  * Useful reflection methods
@@ -34,21 +30,20 @@ class Reflection
      * @param object|string $class              The object or name of object's class
      * @param bool          $withoutInheritance (optional) If is set to true, only methods for given class are returned.
      *                                          Otherwise - all methods, with inherited methods too.
-     * @throws ReflectionException
      * @return array
      */
     public static function getMethods($class, $withoutInheritance = false)
     {
         $effect = [];
 
-        $reflection = new ReflectionClass($class);
+        $reflection = new \ReflectionClass($class);
         $methods = $reflection->getMethods();
 
         if (!empty($methods)) {
             $className = self::getClassName($class);
 
             foreach ($methods as $method) {
-                if ($method instanceof ReflectionMethod) {
+                if ($method instanceof \ReflectionMethod) {
                     if ($withoutInheritance && $className !== $method->class) {
                         continue;
                     }
@@ -65,12 +60,11 @@ class Reflection
      * Returns constants of given class / object
      *
      * @param object|string $class The object or name of object's class
-     * @throws ReflectionException
      * @return array
      */
     public static function getConstants($class)
     {
-        $reflection = new ReflectionClass($class);
+        $reflection = new \ReflectionClass($class);
 
         return $reflection->getConstants();
     }
@@ -80,7 +74,6 @@ class Reflection
      * Constants whose values are integers are considered only.
      *
      * @param object|string $class The object or name of object's class
-     * @throws ReflectionException
      * @return int|null
      */
     public static function getMaxNumberConstant($class)
@@ -107,12 +100,11 @@ class Reflection
      *
      * @param object|string $class  The object or name of object's class
      * @param string        $method Name of the method to find
-     * @throws ReflectionException
      * @return bool
      */
     public static function hasMethod($class, $method)
     {
-        $reflection = new ReflectionClass($class);
+        $reflection = new \ReflectionClass($class);
 
         return $reflection->hasMethod($method);
     }
@@ -122,12 +114,11 @@ class Reflection
      *
      * @param object|string $class    The object or name of object's class
      * @param string        $property Name of the property to find
-     * @throws ReflectionException
      * @return bool
      */
     public static function hasProperty($class, $property)
     {
-        $reflection = new ReflectionClass($class);
+        $reflection = new \ReflectionClass($class);
 
         return $reflection->hasProperty($property);
     }
@@ -137,12 +128,11 @@ class Reflection
      *
      * @param object|string $class    The object or name of object's class
      * @param string        $constant Name of the constant to find
-     * @throws ReflectionException
      * @return bool
      */
     public static function hasConstant($class, $constant)
     {
-        $reflection = new ReflectionClass($class);
+        $reflection = new \ReflectionClass($class);
 
         return $reflection->hasConstant($constant);
     }
@@ -152,12 +142,11 @@ class Reflection
      *
      * @param object|string $class    The object or name of object's class
      * @param string        $constant Name of the constant that contains a value
-     * @throws ReflectionException
      * @return mixed
      */
     public static function getConstantValue($class, $constant)
     {
-        $reflection = new ReflectionClass($class);
+        $reflection = new \ReflectionClass($class);
 
         if (self::hasConstant($class, $constant)) {
             return $reflection->getConstant($constant);
@@ -175,7 +164,6 @@ class Reflection
      *                         dot-separated, e.g. "invoice.user.email".
      * @param bool   $force    (optional) If is set to true, try to retrieve value even if the object doesn't have
      *                         property. Otherwise - not.
-     * @throws ReflectionException
      * @return mixed
      */
     public static function getPropertyValue($object, $property, $force = false)
@@ -197,9 +185,9 @@ class Reflection
              * Let's dig more and get proper value
              *
              * Required to avoid bug:
-             * ReflectionObject::__construct() expects parameter 1 to be object, null given
+             * \ReflectionObject::__construct() expects parameter 1 to be object, null given
              * (...)
-             * 4. at ReflectionObject->__construct (null)
+             * 4. at \ReflectionObject->__construct (null)
              * 5. at Reflection ::getPropertyValue (null, 'name', true)
              * 6. at ListService->getItemValue (object(Deal), 'project.name', '0')
              *
@@ -224,17 +212,17 @@ class Reflection
              * Use \ReflectionObject class
              */
             try {
-                $reflectionProperty = new ReflectionProperty($className, $property);
+                $reflectionProperty = new \ReflectionProperty($className, $property);
                 $value = $reflectionProperty->getValue($object);
-            } catch (ReflectionException $exception) {
+            } catch (\ReflectionException $exception) {
                 /*
                  * 2nd try:
                  * Look for the get / has / is methods
                  */
-                $class = new ReflectionObject($object);
+                $class = new \ReflectionObject($object);
                 $valueFound = false;
 
-                if ($class->hasProperty($property) || $force) {
+                if ($force || $class->hasProperty($property)) {
                     $property = Inflector::classify($property);
 
                     $getterPrefixes = [
@@ -247,7 +235,7 @@ class Reflection
                         $getterName = sprintf('%s%s', $prefix, $property);
 
                         if ($class->hasMethod($getterName)) {
-                            $method = new ReflectionMethod($object, $getterName);
+                            $method = new \ReflectionMethod($object, $getterName);
 
                             /*
                              * Getter is not accessible publicly?
@@ -292,7 +280,6 @@ class Reflection
      * @param string                  $property Name of the property that contains a value
      * @param bool                    $force    (optional) If is set to true, try to retrieve value even if the
      *                                          object does not have property. Otherwise - not.
-     * @throws ReflectionException
      * @return array
      */
     public static function getPropertyValues($objects, $property, $force = false)
@@ -395,13 +382,13 @@ class Reflection
     {
         $fullClassName = self::getClassName($source);
 
-        if (empty($fullClassName)) {
+        if (null === $fullClassName || '' === $fullClassName) {
             return '';
         }
 
         $className = self::getClassName($source, true);
 
-        if ($className == $fullClassName) {
+        if ($className === $fullClassName) {
             return $className;
         }
 
@@ -420,7 +407,7 @@ class Reflection
         $className = self::getClassName($source);
         $interfaces = class_implements($className);
 
-        return in_array($interface, $interfaces);
+        return in_array($interface, $interfaces, true);
     }
 
     /**
@@ -438,7 +425,7 @@ class Reflection
         $parents = class_parents($childClassName);
 
         if (is_array($parents) && 0 < count($parents)) {
-            return in_array($parentClassName, $parents);
+            return in_array($parentClassName, $parents, true);
         }
 
         return false;
@@ -448,23 +435,22 @@ class Reflection
      * Returns given object properties
      *
      * @param array|object|string $source         An array of objects, namespaces, object or namespace
-     * @param int                 $filter         (optional) Filter of properties. Uses ReflectionProperty class
+     * @param int                 $filter         (optional) Filter of properties. Uses \ReflectionProperty class
      *                                            constants. By default all properties are returned.
      * @param bool                $includeParents (optional) If is set to true, properties of parent classes are
      *                                            included (recursively). Otherwise - not.
-     * @throws ReflectionException
-     * @return array|ReflectionProperty
+     * @return array|\ReflectionProperty
      */
     public static function getProperties($source, $filter = null, $includeParents = false)
     {
         $className = self::getClassName($source);
-        $reflection = new ReflectionClass($className);
+        $reflection = new \ReflectionClass($className);
 
         if (null === $filter) {
-            $filter = ReflectionProperty::IS_PRIVATE
-                + ReflectionProperty::IS_PROTECTED
-                + ReflectionProperty::IS_PUBLIC
-                + ReflectionProperty::IS_STATIC;
+            $filter = \ReflectionProperty::IS_PRIVATE
+                + \ReflectionProperty::IS_PROTECTED
+                + \ReflectionProperty::IS_PUBLIC
+                + \ReflectionProperty::IS_STATIC;
         }
 
         $properties = $reflection->getProperties($filter);
@@ -486,13 +472,12 @@ class Reflection
      * Returns a parent class or false if there is no parent class
      *
      * @param array|object|string $source An array of objects, namespaces, object or namespace
-     * @throws ReflectionException
-     * @return ReflectionClass|bool
+     * @return \ReflectionClass|bool
      */
     public static function getParentClass($source)
     {
         $className = self::getClassName($source);
-        $reflection = new ReflectionClass($className);
+        $reflection = new \ReflectionClass($className);
 
         return $reflection->getParentClass();
     }
@@ -541,7 +526,7 @@ class Reflection
                  */
                 $realClass = ClassUtils::getRealClass($oneClass);
 
-                if (in_array($realClass, $childClasses)) {
+                if (in_array($realClass, $childClasses, true)) {
                     continue;
                 }
 
@@ -586,14 +571,13 @@ class Reflection
     }
 
     /**
-     * Returns property, the ReflectionProperty instance, of given object
+     * Returns property, the \ReflectionProperty instance, of given object
      *
      * @param array|object|string $class    An array of objects, namespaces, object or namespace
      * @param string              $property Name of the property
-     * @param int                 $filter   (optional) Filter of properties. Uses ReflectionProperty class constants.
+     * @param int                 $filter   (optional) Filter of properties. Uses \ReflectionProperty class constants.
      *                                      By default all properties are allowed / processed.
-     * @throws ReflectionException
-     * @return null|ReflectionProperty
+     * @return null|\ReflectionProperty
      */
     public static function getProperty($class, $property, $filter = null)
     {
@@ -601,9 +585,9 @@ class Reflection
         $properties = self::getProperties($className, $filter);
 
         if (!empty($properties)) {
-            /* @var $reflectionProperty ReflectionProperty */
+            /* @var $reflectionProperty \ReflectionProperty */
             foreach ($properties as $reflectionProperty) {
-                if ($reflectionProperty->getName() == $property) {
+                if ($reflectionProperty->getName() === $property) {
                     return $reflectionProperty;
                 }
             }
@@ -630,21 +614,21 @@ class Reflection
         /*
          * Oops, cannot resolve class
          */
-        if (empty($className)) {
+        if (null === $className || '' === $className) {
             throw CannotResolveClassNameException::create($class);
         }
 
         /*
          * Oops, cannot resolve trait
          */
-        if (empty($traitName)) {
+        if (null === $traitName || '' === $traitName) {
             throw new CannotResolveClassNameException($class, false);
         }
 
-        $reflection = new ReflectionClass($className);
+        $reflection = new \ReflectionClass($className);
         $traitsNames = $reflection->getTraitNames();
 
-        $uses = in_array($traitName, $traitsNames);
+        $uses = in_array($traitName, $traitsNames, true);
 
         if (!$uses && $verifyParents) {
             $parentClassName = self::getParentClassName($className);
@@ -662,13 +646,12 @@ class Reflection
      * If given class does not extend another, returns null.
      *
      * @param array|object|string $class An array of objects, namespaces, object or namespace
-     * @throws ReflectionException
      * @return string|null
      */
     public static function getParentClassName($class)
     {
         $className = self::getClassName($class);
-        $reflection = new ReflectionClass($className);
+        $reflection = new \ReflectionClass($className);
         $parentClass = $reflection->getParentClass();
 
         if (null === $parentClass || false === $parentClass) {
@@ -677,4 +660,57 @@ class Reflection
 
         return $parentClass->getName();
     }
+
+    /**
+     * Sets value of given property in given object
+     *
+     * @param mixed  $object   Object that should contains given property
+     * @param string $property Name of the property
+     * @param mixed  $value    Value of the property
+     * @throws NotExistingPropertyException
+     */
+    public static function setPropertyValue($object, $property, $value)
+    {
+        $reflectionProperty = self::getProperty($object, $property);
+
+        /*
+         * Oops, property does not exist
+         */
+        if (null === $reflectionProperty) {
+            throw NotExistingPropertyException::create($object, $property);
+        }
+
+        $notAccessible = $reflectionProperty->isPrivate() || $reflectionProperty->isProtected();
+
+        if ($notAccessible) {
+            $reflectionProperty->setAccessible(true);
+        }
+
+        $reflectionProperty->setValue($object, $value);
+
+        if ($notAccessible) {
+            $reflectionProperty->setAccessible(false);
+        }
+    }
+
+    /**
+     * Sets values of properties in given object
+     *
+     * @param mixed $object           Object that should contains given property
+     * @param array $propertiesValues Key-value pairs, where key - name of the property, value - value of the property
+     */
+    public static function setPropertiesValues($object, array $propertiesValues)
+    {
+        /*
+         * No properties?
+         * Nothing to do
+         */
+        if (empty($propertiesValues)) {
+            return;
+        }
+
+        foreach ($propertiesValues as $property => $value) {
+            static::setPropertyValue($object, $property, $value);
+        }
+    }
 }

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>
@@ -40,6 +40,18 @@ class Regex
         'color'            => '/^[a-f0-9]{6}$/i',
         'bundleName'       => '/^(([A-Z]{1}[a-z0-9]+)((?2))*)(Bundle)$/',
         'binaryValue'      => '/[^\x20-\x7E\t\r\n]/',
+
+        /*
+         * Matches:
+         * - "200x125"
+         * - "200 x 125"
+         * - "200 x   125"
+         * - "   200 x   125"
+         * - "   200   x 125   "
+         *
+         * Contains "%s" that should be replaced with separator used to split width and height.
+         */
+        'size'             => '/^[\ ]*(\d+)[\ ]*%s[\ ]*(\d+)[\ ]*$/',
     ];
 
     /**
@@ -102,7 +114,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 +137,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 +257,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 +315,9 @@ class Regex
 
             if ($mustAllMatch) {
                 $effect = $effect && $matched;
-            } else {
-                if ($matched) {
-                    $effect = $matched;
-                    break;
-                }
+            } elseif ($matched) {
+                $effect = $matched;
+                break;
             }
         }
 
@@ -501,7 +508,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 +529,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 +614,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 +701,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 +730,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 +931,87 @@ class Regex
 
         return (bool)preg_match($pattern, $value);
     }
+
+    /**
+     * Returns pattern used to validate / verify size
+     *
+     * @param string $separator (optional) Separator used to split width and height. Default: " x ".
+     * @return string
+     */
+    public static function getSizePattern($separator = ' x ')
+    {
+        $escapeMe = [
+            '/',
+            '|',
+            '.',
+            '(',
+            ')',
+            '[',
+            ']',
+        ];
+
+        $cleanSeparator = trim($separator);
+
+        if (in_array($cleanSeparator, $escapeMe, true)) {
+            // I have to escape special character of  regular expression that may be used as separator
+            $separator = str_replace($cleanSeparator, '\\' . $cleanSeparator, $separator);
+        }
+
+        return sprintf(self::$patterns['size'], $separator);
+    }
+
+    /**
+     * Returns information if given value is a size value
+     *
+     * @param string $value     Value to verify
+     * @param string $separator (optional) Separator used to split width and height. Default: " x ".
+     * @return bool
+     */
+    public static function isSizeValue($value, $separator = ' x ')
+    {
+        /*
+         * Not a string?
+         * Nothing to do
+         */
+        if (!is_string($value)) {
+            return false;
+        }
+
+        $pattern = self::getSizePattern($separator);
+
+        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/Repository.php

@@ -177,10 +177,13 @@ class Repository
         $direction = 'ASC'
     ) {
         $alias = 'qb';
+        $queryBuilder = $repository->createQueryBuilder($alias);
 
-        return $repository
-            ->createQueryBuilder($alias)
-            ->orderBy(sprintf('%s.%s', $alias, $property), $direction);
+        if (empty($property)) {
+            return $queryBuilder;
+        }
+
+        return $queryBuilder->orderBy(sprintf('%s.%s', $alias, $property), $direction);
     }
 
     /**

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;
+    }
+}

src/ValueObject/Human.php

@@ -0,0 +1,22 @@
+<?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\Traits\ValueObject\HumanTrait;
+
+/**
+ * Human
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+class Human
+{
+    use HumanTrait;
+}

src/ValueObject/Size.php

@@ -0,0 +1,245 @@
+<?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\Exception\ValueObject\InvalidSizeDimensionsException;
+use Meritoo\Common\Utilities\Regex;
+
+/**
+ * Size, e.g. of image
+ *
+ * Instance of this class may be created using static methods:
+ * - fromString()
+ * - fromArray()
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+class Size
+{
+    /**
+     * The width
+     *
+     * @var int
+     */
+    protected $width;
+
+    /**
+     * The height
+     *
+     * @var int
+     */
+    protected $height;
+
+    /**
+     * Unit used when width or height should be returned with unit
+     *
+     * @var string
+     */
+    protected $unit;
+
+    /**
+     * Separator used when converting to string
+     *
+     * @var string
+     */
+    protected $separator = ' x ';
+
+    /**
+     * Class constructor
+     *
+     * @param int    $width  (optional) The width
+     * @param int    $height (optional) The height
+     * @param string $unit   (optional) Unit used when width or height should be returned with unit. Default: "px".
+     *
+     * @throws InvalidSizeDimensionsException
+     */
+    private function __construct($width = null, $height = null, $unit = 'px')
+    {
+        $width = (int)$width;
+        $height = (int)$height;
+
+        if ($width < 0 || $height < 0) {
+            throw new InvalidSizeDimensionsException($width, $height);
+        }
+
+        $this
+            ->setWidth($width)
+            ->setHeight($height)
+        ;
+
+        $this->unit = $unit;
+    }
+
+    /**
+     * Returns string representation of instance of this class in human readable format, e.g. '200 x 100'
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toString();
+    }
+
+    /**
+     * Sets separator used when converting to string
+     *
+     * @param string $separator The separator
+     * @return Size
+     */
+    public function setSeparator($separator)
+    {
+        $this->separator = $separator;
+
+        return $this;
+    }
+
+    /**
+     * Returns the width
+     *
+     * @param bool $withUnit (optional) If is set to true, width is returned with unit ("px"). Otherwise - without
+     *                       (default behaviour).
+     * @return int|string
+     */
+    public function getWidth($withUnit = false)
+    {
+        if ($withUnit) {
+            return sprintf('%d %s', $this->width, $this->unit);
+        }
+
+        return $this->width;
+    }
+
+    /**
+     * Sets the width
+     *
+     * @param int|string $width The width
+     * @return Size
+     */
+    public function setWidth($width)
+    {
+        $this->width = (int)$width;
+
+        return $this;
+    }
+
+    /**
+     * Returns the height
+     *
+     * @param bool $withUnit (optional) If is set to true, height is returned with unit ("px"). Otherwise - without
+     *                       (default behaviour).
+     * @return int|string
+     */
+    public function getHeight($withUnit = false)
+    {
+        if ($withUnit) {
+            return sprintf('%d %s', $this->height, $this->unit);
+        }
+
+        return $this->height;
+    }
+
+    /**
+     * Sets the height
+     *
+     * @param int $height The height
+     * @return Size
+     */
+    public function setHeight($height)
+    {
+        $this->height = (int)$height;
+
+        return $this;
+    }
+
+    /**
+     * Returns string representation of instance of this class, e.g. '200 x 100' or '200x100'
+     *
+     * @param bool $withUnit (optional) If is set to true, width and height are returned with unit ("px"). Otherwise
+     *                       - without (default behaviour).
+     * @return string
+     */
+    public function toString($withUnit = false)
+    {
+        $width = $this->getWidth($withUnit);
+        $height = $this->getHeight($withUnit);
+
+        return sprintf('%s%s%s', $width, $this->separator, $height);
+    }
+
+    /**
+     * Returns instance of this class as an array.
+     * Values of the array are width and height, eg. [800, 600] or ['800px', '600px'].
+     *
+     * @param bool $withUnits (optional) If is set to true, width and height are returned with unit ("px"). Otherwise
+     *                        - without (default behaviour).
+     * @return array
+     */
+    public function toArray($withUnits = false)
+    {
+        return [
+            $this->getWidth($withUnits),
+            $this->getHeight($withUnits),
+        ];
+    }
+
+    /**
+     * Creates new instance from given string
+     *
+     * @param string $size      The size represented as string (width and height separated by given separator)
+     * @param string $unit      (optional) Unit used when width or height should be returned with unit. Default: "px".
+     * @param string $separator (optional) Separator used to split width and height. Default: " x ".
+     * @return Size|null
+     */
+    public static function fromString($size, $unit = 'px', $separator = ' x ')
+    {
+        if (is_string($size)) {
+            $matches = [];
+            $pattern = Regex::getSizePattern($separator);
+
+            if ((bool)preg_match($pattern, $size, $matches)) {
+                $width = (int)$matches[1];
+                $height = (int)$matches[2];
+                $sizeObject = new self($width, $height, $unit);
+
+                return $sizeObject->setSeparator($separator);
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Creates new instance from given array
+     *
+     * The array should contain 2 elements: width and height.
+     * Examples: ['800', '600'], [800, 600].
+     *
+     * @param array  $array The size represented as array
+     * @param string $unit  (optional) Unit used when width or height should be returned with unit. Default: "px".
+     * @return Size|null
+     */
+    public static function fromArray(array $array, $unit = 'px')
+    {
+        // Requirements for given array:
+        // - indexes "0" and "1"
+        // - should contains exactly 2 elements
+        if (
+            array_key_exists(0, $array)
+            && array_key_exists(1, $array)
+            && 2 === count($array)
+        ) {
+            list($width, $height) = $array;
+
+            return new self($width, $height, $unit);
+        }
+
+        return null;
+    }
+}

src/ValueObject/Version.php

@@ -22,7 +22,7 @@ class Version
      *
      * @var int
      */
-    private $majorPart;
+    protected $majorPart;
 
     /**
      * The "minor" part.
@@ -30,7 +30,7 @@ class Version
      *
      * @var int
      */
-    private $minorPart;
+    protected $minorPart;
 
     /**
      * The "patch" part.
@@ -38,7 +38,7 @@ class Version
      *
      * @var int
      */
-    private $patchPart;
+    protected $patchPart;
 
     /**
      * Class constructor
@@ -88,7 +88,7 @@ class Version
     }
 
     /**
-     * Returns string representation of instance of this class
+     * Returns representation of object as string
      *
      * @return string
      */

tests/Collection/CollectionTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Collection;
+namespace Meritoo\Test\Common\Collection;
 
 use ArrayIterator;
 use Generator;
@@ -45,12 +45,12 @@ class CollectionTest extends BaseTestCase
 
     public function testEmptyCollection()
     {
-        static::assertEquals(0, $this->emptyCollection->count());
+        static::assertSame(0, $this->emptyCollection->count());
         static::assertCount(0, $this->emptyCollection);
         static::assertEmpty($this->emptyCollection);
 
         static::assertTrue($this->emptyCollection->isEmpty());
-        static::assertEquals([], $this->emptyCollection->toArray());
+        static::assertSame([], $this->emptyCollection->toArray());
         static::assertEmpty($this->emptyCollection->toArray());
 
         static::assertNull($this->emptyCollection->getFirst());
@@ -61,23 +61,23 @@ class CollectionTest extends BaseTestCase
 
     public function testNotEmptyCollection()
     {
-        static::assertEquals(4, $this->simpleCollection->count());
+        static::assertSame(4, $this->simpleCollection->count());
         static::assertCount(4, $this->simpleCollection);
         static::assertNotEmpty($this->simpleCollection);
 
         static::assertFalse($this->simpleCollection->isEmpty());
-        static::assertEquals($this->simpleElements, $this->simpleCollection->toArray());
+        static::assertSame($this->simpleElements, $this->simpleCollection->toArray());
         static::assertNotEmpty($this->simpleCollection->toArray());
 
-        static::assertEquals('lorem', $this->simpleCollection->getFirst());
-        static::assertEquals('sit', $this->simpleCollection->getLast());
-        static::assertEquals('dolor', $this->simpleCollection[123]);
+        static::assertSame('lorem', $this->simpleCollection->getFirst());
+        static::assertSame('sit', $this->simpleCollection->getLast());
+        static::assertSame('dolor', $this->simpleCollection[123]);
     }
 
     public function testCount()
     {
-        static::assertEquals(0, $this->emptyCollection->count());
-        static::assertEquals(4, $this->simpleCollection->count());
+        static::assertSame(0, $this->emptyCollection->count());
+        static::assertSame(4, $this->simpleCollection->count());
     }
 
     public function testOffsetExists()
@@ -94,8 +94,8 @@ class CollectionTest extends BaseTestCase
         static::assertNull($this->emptyCollection['abc']);
         static::assertNull($this->simpleCollection['abc']);
 
-        static::assertEquals('lorem', $this->simpleCollection[0]);
-        static::assertEquals('sit', $this->simpleCollection[345]);
+        static::assertSame('lorem', $this->simpleCollection[0]);
+        static::assertSame('sit', $this->simpleCollection[345]);
     }
 
     public function testOffsetSet()
@@ -104,10 +104,10 @@ class CollectionTest extends BaseTestCase
         $this->simpleCollection['test2'] = 5678;
 
         static::assertTrue($this->emptyCollection->has(1234));
-        static::assertEquals(1234, $this->emptyCollection['test1']);
+        static::assertSame(1234, $this->emptyCollection['test1']);
 
         static::assertTrue($this->simpleCollection->has(5678));
-        static::assertEquals(5678, $this->simpleCollection['test2']);
+        static::assertSame(5678, $this->simpleCollection['test2']);
     }
 
     public function testOffsetUnset()
@@ -115,14 +115,14 @@ class CollectionTest extends BaseTestCase
         unset($this->simpleCollection[0]);
 
         static::assertFalse($this->simpleCollection->has('lorem'));
-        static::assertEquals('ipsum', $this->simpleCollection[1]);
-        static::assertEquals(3, $this->simpleCollection->count());
+        static::assertSame('ipsum', $this->simpleCollection[1]);
+        static::assertSame(3, $this->simpleCollection->count());
 
         unset($this->simpleCollection[123]);
 
         static::assertFalse($this->simpleCollection->has('dolor'));
-        static::assertEquals('ipsum', $this->simpleCollection[1]);
-        static::assertEquals(2, $this->simpleCollection->count());
+        static::assertSame('ipsum', $this->simpleCollection[1]);
+        static::assertSame(2, $this->simpleCollection->count());
     }
 
     public function testGetIterator()
@@ -143,8 +143,8 @@ class CollectionTest extends BaseTestCase
         $collection->add($element);
 
         static::assertTrue($collection->has($element));
-        static::assertEquals($expectedCount, $collection->count());
-        static::assertEquals($element, $collection[$expectedIndex]);
+        static::assertSame($expectedCount, $collection->count());
+        static::assertSame($element, $collection[$expectedIndex]);
     }
 
     /**
@@ -161,15 +161,15 @@ class CollectionTest extends BaseTestCase
         $collection->add($element, $index);
 
         static::assertTrue($collection->has($element));
-        static::assertEquals($expectedCount, $collection->count());
-        static::assertEquals($element, $collection[$expectedIndex]);
+        static::assertSame($expectedCount, $collection->count());
+        static::assertSame($element, $collection[$expectedIndex]);
     }
 
     public function testAddMultipleUsingEmptyArray()
     {
         $this->emptyCollection->addMultiple([]);
 
-        static::assertEquals(0, $this->emptyCollection->count());
+        static::assertSame(0, $this->emptyCollection->count());
         static::assertTrue($this->emptyCollection->isEmpty());
     }
 
@@ -185,12 +185,12 @@ class CollectionTest extends BaseTestCase
         $this->emptyCollection->addMultiple($elements);
 
         static::assertFalse($this->emptyCollection->isEmpty());
-        static::assertEquals(4, $this->emptyCollection->count());
+        static::assertSame(4, $this->emptyCollection->count());
 
-        static::assertEquals('test1', $this->emptyCollection[0]);
-        static::assertEquals('test2', $this->emptyCollection[1]);
-        static::assertEquals('test3', $this->emptyCollection[2]);
-        static::assertEquals('test4', $this->emptyCollection[3]);
+        static::assertSame('test1', $this->emptyCollection[0]);
+        static::assertSame('test2', $this->emptyCollection[1]);
+        static::assertSame('test3', $this->emptyCollection[2]);
+        static::assertSame('test4', $this->emptyCollection[3]);
     }
 
     public function testAddMultipleUsingIndexes()
@@ -205,12 +205,12 @@ class CollectionTest extends BaseTestCase
         $this->emptyCollection->addMultiple($elements, true);
 
         static::assertFalse($this->emptyCollection->isEmpty());
-        static::assertEquals(4, $this->emptyCollection->count());
+        static::assertSame(4, $this->emptyCollection->count());
 
-        static::assertEquals('test1', $this->emptyCollection[0]);
-        static::assertEquals('test2', $this->emptyCollection[1]);
-        static::assertEquals('test3', $this->emptyCollection[1234]);
-        static::assertEquals('test4', $this->emptyCollection[5678]);
+        static::assertSame('test1', $this->emptyCollection[0]);
+        static::assertSame('test2', $this->emptyCollection[1]);
+        static::assertSame('test3', $this->emptyCollection[1234]);
+        static::assertSame('test4', $this->emptyCollection[5678]);
     }
 
     public function testPrepend()
@@ -218,14 +218,14 @@ class CollectionTest extends BaseTestCase
         $this->emptyCollection->prepend('lorem-ipsum');
 
         static::assertFalse($this->emptyCollection->isEmpty());
-        static::assertEquals(1, $this->emptyCollection->count());
-        static::assertEquals('lorem-ipsum', $this->emptyCollection[0]);
+        static::assertSame(1, $this->emptyCollection->count());
+        static::assertSame('lorem-ipsum', $this->emptyCollection[0]);
 
         $this->simpleCollection->prepend('lorem-ipsum');
 
         static::assertFalse($this->simpleCollection->isEmpty());
-        static::assertEquals(5, $this->simpleCollection->count());
-        static::assertEquals('lorem-ipsum', $this->simpleCollection[0]);
+        static::assertSame(5, $this->simpleCollection->count());
+        static::assertSame('lorem-ipsum', $this->simpleCollection[0]);
     }
 
     public function testRemoveNotExistingElement()
@@ -233,24 +233,24 @@ class CollectionTest extends BaseTestCase
         $this->emptyCollection->remove('abc');
 
         static::assertTrue($this->emptyCollection->isEmpty());
-        static::assertEquals(0, $this->emptyCollection->count());
+        static::assertSame(0, $this->emptyCollection->count());
 
         $this->simpleCollection->remove('abc');
 
         static::assertFalse($this->simpleCollection->isEmpty());
-        static::assertEquals(4, $this->simpleCollection->count());
+        static::assertSame(4, $this->simpleCollection->count());
     }
 
     public function testRemove()
     {
         static::assertFalse($this->simpleCollection->isEmpty());
-        static::assertEquals(4, $this->simpleCollection->count());
-        static::assertEquals('ipsum', $this->simpleCollection[1]);
+        static::assertSame(4, $this->simpleCollection->count());
+        static::assertSame('ipsum', $this->simpleCollection[1]);
 
         $this->simpleCollection->remove('ipsum');
 
         static::assertFalse($this->simpleCollection->isEmpty());
-        static::assertEquals(3, $this->simpleCollection->count());
+        static::assertSame(3, $this->simpleCollection->count());
         static::assertNull($this->simpleCollection[1]);
     }
 
@@ -290,8 +290,8 @@ class CollectionTest extends BaseTestCase
         static::assertNull($this->simpleCollection->getPrevious('abc'));
         static::assertNull($this->simpleCollection->getPrevious('lorem'));
 
-        static::assertEquals('lorem', $this->simpleCollection->getPrevious('ipsum'));
-        static::assertEquals('dolor', $this->simpleCollection->getPrevious('sit'));
+        static::assertSame('lorem', $this->simpleCollection->getPrevious('ipsum'));
+        static::assertSame('dolor', $this->simpleCollection->getPrevious('sit'));
     }
 
     public function testGetNext()
@@ -300,26 +300,26 @@ class CollectionTest extends BaseTestCase
         static::assertNull($this->simpleCollection->getNext('abc'));
         static::assertNull($this->simpleCollection->getNext('sit'));
 
-        static::assertEquals('dolor', $this->simpleCollection->getNext('ipsum'));
-        static::assertEquals('sit', $this->simpleCollection->getNext('dolor'));
+        static::assertSame('dolor', $this->simpleCollection->getNext('ipsum'));
+        static::assertSame('sit', $this->simpleCollection->getNext('dolor'));
     }
 
     public function testGetFirst()
     {
         static::assertNull($this->emptyCollection->getFirst());
-        static::assertEquals('lorem', $this->simpleCollection->getFirst());
+        static::assertSame('lorem', $this->simpleCollection->getFirst());
     }
 
     public function testGetLast()
     {
         static::assertNull($this->emptyCollection->getLast());
-        static::assertEquals('sit', $this->simpleCollection->getLast());
+        static::assertSame('sit', $this->simpleCollection->getLast());
     }
 
     public function testToArray()
     {
-        static::assertEquals([], $this->emptyCollection->toArray());
-        static::assertEquals($this->simpleElements, $this->simpleCollection->toArray());
+        static::assertSame([], $this->emptyCollection->toArray());
+        static::assertSame($this->simpleElements, $this->simpleCollection->toArray());
     }
 
     public function testExistsVisibilityAndArguments()
@@ -327,6 +327,19 @@ class CollectionTest extends BaseTestCase
         static::assertMethodVisibilityAndArguments(Collection::class, 'exists', OopVisibilityType::IS_PRIVATE, 1, 1);
     }
 
+    /**
+     * @param string     $description Description of test
+     * @param Collection $collection  Collection to search for element with given index
+     * @param mixed      $index       Index / key of the element
+     * @param mixed      $expected    Expected element with given index
+     *
+     * @dataProvider provideElementGetByIndex
+     */
+    public function testGetByIndex($description, Collection $collection, $index, $expected)
+    {
+        static::assertEquals($expected, $collection->getByIndex($index), $description);
+    }
+
     /**
      * Provides element to add to collection
      *
@@ -408,6 +421,73 @@ class CollectionTest extends BaseTestCase
         ];
     }
 
+    public function provideElementGetByIndex()
+    {
+        yield[
+            'An empty collection and empty index',
+            new Collection(),
+            '',
+            null,
+        ];
+
+        yield[
+            'An empty collection and non-empty index',
+            new Collection(),
+            'test',
+            null,
+        ];
+
+        yield[
+            'Non-empty collection and not existing index',
+            new Collection([
+                'lorem' => 'ipsum',
+                'dolor' => 'sit',
+            ]),
+            'test',
+            null,
+        ];
+
+        yield[
+            'Collection with existing index',
+            new Collection([
+                'lorem' => 'ipsum',
+                'dolor' => 'sit',
+            ]),
+            'lorem',
+            'ipsum',
+        ];
+
+        yield[
+            'Collection with existing index (collection of arrays)',
+            new Collection([
+                [
+                    'lorem',
+                    'ipsum',
+                ],
+                [
+                    'dolor',
+                    'sit',
+                ],
+            ]),
+            0,
+            [
+                'lorem',
+                'ipsum',
+            ],
+        ];
+
+        yield[
+            'Collection with existing index (collection of objects)',
+            new Collection([
+                'x' => new \DateTime(),
+                'y' => new \DateTime('2001-01-01'),
+                'z' => new \DateTime('yesterday'),
+            ]),
+            'y',
+            new \DateTime('2001-01-01'),
+        ];
+    }
+
     /**
      * {@inheritdoc}
      */

tests/Exception/Base/UnknownTypeExceptionTest.php

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

tests/Exception/Bundle/IncorrectBundleNameExceptionTest.php

@@ -0,0 +1,74 @@
+<?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\Test\Common\Exception\Bundle;
+
+use Meritoo\Common\Exception\Bundle\IncorrectBundleNameException;
+use Meritoo\Common\Test\Base\BaseTestCase;
+use Meritoo\Common\Type\OopVisibilityType;
+
+/**
+ * Test case of an exception used while name of bundle is incorrect
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+class IncorrectBundleNameExceptionTest extends BaseTestCase
+{
+    public function testConstructor()
+    {
+        static::assertConstructorVisibilityAndArguments(
+            IncorrectBundleNameException::class,
+            OopVisibilityType::IS_PUBLIC,
+            3
+        );
+    }
+
+    /**
+     * @param string $description     Description of test
+     * @param string $bundleName      Incorrect name of bundle
+     * @param string $expectedMessage Expected exception's message
+     *
+     * @dataProvider provideBundleNameAndMessage
+     */
+    public function testCreate($description, $bundleName, $expectedMessage)
+    {
+        $exception = IncorrectBundleNameException::create($bundleName);
+        static::assertSame($expectedMessage, $exception->getMessage(), $description);
+    }
+
+    public function provideBundleNameAndMessage()
+    {
+        $template = 'Name of bundle \'%s\' is incorrect. It should start with big letter and end with "Bundle". Is'
+            . ' there everything ok?';
+
+        yield[
+            'An empty string as name of bundle',
+            '',
+            sprintf($template, ''),
+        ];
+
+        yield[
+            'Null as name of bundle',
+            null,
+            sprintf($template, ''),
+        ];
+
+        yield[
+            'String with spaces as name of bundle',
+            'This is test',
+            sprintf($template, 'This is test'),
+        ];
+
+        yield[
+            'String without spaces as name of bundle',
+            'ThisIsTest',
+            sprintf($template, 'ThisIsTest'),
+        ];
+    }
+}

tests/Exception/Date/UnknownDatePartTypeExceptionTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Exception\Date;
+namespace Meritoo\Test\Common\Exception\Date;
 
 use Generator;
 use Meritoo\Common\Exception\Type\UnknownDatePartTypeException;
@@ -37,7 +37,7 @@ class UnknownDatePartTypeExceptionTest extends BaseTestCase
     public function testMessage($unknownDatePart, $value, $expectedMessage)
     {
         $exception = UnknownDatePartTypeException::createException($unknownDatePart, $value);
-        static::assertEquals($expectedMessage, $exception->getMessage());
+        static::assertSame($expectedMessage, $exception->getMessage());
     }
 
     /**

tests/Exception/File/EmptyFileExceptionTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Exception\File;
+namespace Meritoo\Test\Common\Exception\File;
 
 use Generator;
 use Meritoo\Common\Exception\File\EmptyFileException;
@@ -35,7 +35,7 @@ class EmptyFileExceptionTest extends BaseTestCase
     public function testMessage($emptyFilePath, $expectedMessage)
     {
         $exception = EmptyFileException::create($emptyFilePath);
-        static::assertEquals($expectedMessage, $exception->getMessage());
+        static::assertSame($expectedMessage, $exception->getMessage());
     }
 
     /**

tests/Exception/File/EmptyFilePathExceptionTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Exception\File;
+namespace Meritoo\Test\Common\Exception\File;
 
 use Meritoo\Common\Exception\File\EmptyFilePathException;
 use Meritoo\Common\Test\Base\BaseTestCase;
@@ -28,6 +28,6 @@ class EmptyFilePathExceptionTest extends BaseTestCase
     public function testConstructorMessage()
     {
         $exception = EmptyFilePathException::create();
-        static::assertEquals('Path of the file is empty. Did you provide path of proper file?', $exception->getMessage());
+        static::assertSame('Path of the file is empty. Did you provide path of proper file?', $exception->getMessage());
     }
 }

tests/Exception/File/NotExistingFileExceptionTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Exception\File;
+namespace Meritoo\Test\Common\Exception\File;
 
 use Generator;
 use Meritoo\Common\Exception\File\NotExistingFileException;
@@ -35,7 +35,7 @@ class NotExistingFileExceptionTest extends BaseTestCase
     public function testConstructorMessage($notExistingFilePath, $expectedMessage)
     {
         $exception = NotExistingFileException::create($notExistingFilePath);
-        static::assertEquals($expectedMessage, $exception->getMessage());
+        static::assertSame($expectedMessage, $exception->getMessage());
     }
 
     /**

tests/Exception/Method/DisabledMethodExceptionTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Exception\Method;
+namespace Meritoo\Test\Common\Exception\Method;
 
 use Generator;
 use Meritoo\Common\Exception\Method\DisabledMethodException;
@@ -37,7 +37,7 @@ class DisabledMethodExceptionTest extends BaseTestCase
     public function testConstructorMessage($disabledMethod, $alternativeMethod, $expectedMessage)
     {
         $exception = DisabledMethodException::create($disabledMethod, $alternativeMethod);
-        static::assertEquals($expectedMessage, $exception->getMessage());
+        static::assertSame($expectedMessage, $exception->getMessage());
     }
 
     /**

tests/Exception/Reflection/CannotResolveClassNameExceptionTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Exception\Reflection;
+namespace Meritoo\Test\Common\Exception\Reflection;
 
 use Generator;
 use Meritoo\Common\Exception\Reflection\CannotResolveClassNameException;
@@ -38,7 +38,7 @@ class CannotResolveClassNameExceptionTest extends BaseTestCase
     public function testConstructorMessage($source, $forClass, $expectedMessage)
     {
         $exception = CannotResolveClassNameException::create($source, $forClass);
-        static::assertEquals($expectedMessage, $exception->getMessage());
+        static::assertSame($expectedMessage, $exception->getMessage());
     }
 
     /**

tests/Exception/Reflection/MissingChildClassesExceptionTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Exception\Reflection;
+namespace Meritoo\Test\Common\Exception\Reflection;
 
 use Generator;
 use Meritoo\Common\Exception\Reflection\MissingChildClassesException;
@@ -36,7 +36,7 @@ class MissingChildClassesExceptionTest extends BaseTestCase
     public function testConstructorMessage($parentClass, $expectedMessage)
     {
         $exception = MissingChildClassesException::create($parentClass);
-        static::assertEquals($expectedMessage, $exception->getMessage());
+        static::assertSame($expectedMessage, $exception->getMessage());
     }
 
     /**

tests/Exception/Reflection/NotExistingPropertyExceptionTest.php

@@ -0,0 +1,78 @@
+<?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\Test\Common\Exception\Reflection;
+
+use Meritoo\Common\Exception\Reflection\NotExistingPropertyException;
+use Meritoo\Common\Test\Base\BaseTestCase;
+use Meritoo\Common\Type\OopVisibilityType;
+
+/**
+ * Class NotExistingPropertyExceptionTest
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+class NotExistingPropertyExceptionTest extends BaseTestCase
+{
+    public function testConstructor()
+    {
+        static::assertConstructorVisibilityAndArguments(
+            NotExistingPropertyException::class,
+            OopVisibilityType::IS_PUBLIC,
+            3
+        );
+    }
+
+    /**
+     * @param string $description     Description of test
+     * @param mixed  $object          Object that should contains given property
+     * @param string $property        Name of the property
+     * @param string $expectedMessage Expected exception's message
+     *
+     * @dataProvider provideObjectPropertyAndMessage
+     */
+    public function testCreate($description, $object, $property, $expectedMessage)
+    {
+        $exception = NotExistingPropertyException::create($object, $property);
+        static::assertSame($expectedMessage, $exception->getMessage(), $description);
+    }
+
+    public function provideObjectPropertyAndMessage()
+    {
+        $template = 'Property \'%s\' does not exist in instance of class \'%s\'. Did you use proper name of property?';
+
+        yield[
+            'An empty string as name of property',
+            new \stdClass(),
+            '',
+            sprintf($template, '', get_class(new \stdClass())),
+        ];
+
+        yield[
+            'Null as name of property',
+            new \stdClass(),
+            null,
+            sprintf($template, '', get_class(new \stdClass())),
+        ];
+
+        yield[
+            'String with spaces as name of property',
+            new \stdClass(),
+            'This is test',
+            sprintf($template, 'This is test', get_class(new \stdClass())),
+        ];
+
+        yield[
+            'String without spaces as name of property',
+            new \stdClass(),
+            'ThisIsTest',
+            sprintf($template, 'ThisIsTest', get_class(new \stdClass())),
+        ];
+    }
+}

tests/Exception/Reflection/TooManyChildClassesExceptionTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Exception\Reflection;
+namespace Meritoo\Test\Common\Exception\Reflection;
 
 use Generator;
 use Meritoo\Common\Exception\Reflection\TooManyChildClassesException;
@@ -37,7 +37,7 @@ class TooManyChildClassesExceptionTest extends BaseTestCase
     public function testConstructorMessage($parentClass, array $childClasses, $expectedMessage)
     {
         $exception = TooManyChildClassesException::create($parentClass, $childClasses);
-        static::assertEquals($expectedMessage, $exception->getMessage());
+        static::assertSame($expectedMessage, $exception->getMessage());
     }
 
     /**

tests/Exception/Regex/IncorrectColorHexLengthExceptionTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Exception\Regex;
+namespace Meritoo\Test\Common\Exception\Regex;
 
 use Generator;
 use Meritoo\Common\Exception\Regex\IncorrectColorHexLengthException;
@@ -35,7 +35,7 @@ class IncorrectColorHexLengthExceptionTest extends BaseTestCase
     public function testConstructorMessage($color, $expectedMessage)
     {
         $exception = IncorrectColorHexLengthException::create($color);
-        static::assertEquals($expectedMessage, $exception->getMessage());
+        static::assertSame($expectedMessage, $exception->getMessage());
     }
 
     /**

tests/Exception/Regex/InvalidColorHexValueExceptionTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Exception\Regex;
+namespace Meritoo\Test\Common\Exception\Regex;
 
 use Generator;
 use Meritoo\Common\Exception\Regex\InvalidColorHexValueException;
@@ -35,7 +35,7 @@ class InvalidColorHexValueExceptionTest extends BaseTestCase
     public function testConstructorMessage($color, $expectedMessage)
     {
         $exception = InvalidColorHexValueException::create($color);
-        static::assertEquals($expectedMessage, $exception->getMessage());
+        static::assertSame($expectedMessage, $exception->getMessage());
     }
 
     /**

tests/Exception/Regex/InvalidHtmlAttributesExceptionTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Exception\Regex;
+namespace Meritoo\Test\Common\Exception\Regex;
 
 use Generator;
 use Meritoo\Common\Exception\Regex\InvalidHtmlAttributesException;
@@ -35,7 +35,7 @@ class InvalidHtmlAttributesExceptionTest extends BaseTestCase
     public function testConstructorMessage($htmlAttributes, $expectedMessage)
     {
         $exception = InvalidHtmlAttributesException::create($htmlAttributes);
-        static::assertEquals($expectedMessage, $exception->getMessage());
+        static::assertSame($expectedMessage, $exception->getMessage());
     }
 
     /**

tests/Exception/Regex/InvalidUrlExceptionTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Exception\Regex;
+namespace Meritoo\Test\Common\Exception\Regex;
 
 use Generator;
 use Meritoo\Common\Exception\Regex\InvalidUrlException;
@@ -35,7 +35,7 @@ class InvalidUrlExceptionTest extends BaseTestCase
     public function testConstructorMessage($url, $expectedMessage)
     {
         $exception = InvalidUrlException::create($url);
-        static::assertEquals($expectedMessage, $exception->getMessage());
+        static::assertSame($expectedMessage, $exception->getMessage());
     }
 
     /**

tests/Exception/Type/UnknownOopVisibilityTypeExceptionTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Exception\Type;
+namespace Meritoo\Test\Common\Exception\Type;
 
 use Generator;
 use Meritoo\Common\Exception\Type\UnknownOopVisibilityTypeException;
@@ -36,7 +36,7 @@ class UnknownOopVisibilityTypeExceptionTest extends BaseTestCase
     public function testConstructorMessage($unknownType, $expectedMessage)
     {
         $exception = UnknownOopVisibilityTypeException::createException($unknownType);
-        static::assertEquals($expectedMessage, $exception->getMessage());
+        static::assertSame($expectedMessage, $exception->getMessage());
     }
 
     /**

tests/Exception/ValueObject/InvalidSizeDimensionsExceptionTest.php

@@ -0,0 +1,67 @@
+<?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\Test\Common\Exception\ValueObject;
+
+use Meritoo\Common\Exception\ValueObject\InvalidSizeDimensionsException;
+use Meritoo\Common\Test\Base\BaseTestCase;
+use Meritoo\Common\Type\OopVisibilityType;
+
+/**
+ * Test case of an exception used while dimensions of size, passed to the instance of Size class, are invalid
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+class InvalidSizeDimensionsExceptionTest extends BaseTestCase
+{
+    public function testConstructorVisibilityAndArguments()
+    {
+        static::assertConstructorVisibilityAndArguments(
+            InvalidSizeDimensionsException::class,
+            OopVisibilityType::IS_PUBLIC,
+            3
+        );
+    }
+
+    /**
+     * @param int    $width           The width
+     * @param int    $height          The height
+     * @param string $expectedMessage Expected exception's message
+     *
+     * @dataProvider provideWidthAndHeight
+     */
+    public function testCreate($width, $height, $expectedMessage)
+    {
+        $exception = InvalidSizeDimensionsException::create($width, $height);
+        static::assertSame($expectedMessage, $exception->getMessage());
+    }
+
+    public function provideWidthAndHeight()
+    {
+        $template = 'Dimensions of size should be positive, but they are not: %d, %d. Is there everything ok?';
+
+        yield[
+            0,
+            0,
+            sprintf($template, 0, 0),
+        ];
+
+        yield[
+            -1,
+            -1,
+            sprintf($template, -1, -1),
+        ];
+
+        yield[
+            200,
+            100,
+            sprintf($template, 200, 100),
+        ];
+    }
+}

tests/Test/Base/BaseTestCaseTest.php

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

tests/Type/Base/BaseTypeTest.php

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

tests/Type/DatePartTypeTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Type;
+namespace Meritoo\Test\Common\Type;
 
 use Meritoo\Common\Test\Base\BaseTypeTestCase;
 use Meritoo\Common\Type\DatePartType;
@@ -19,29 +19,6 @@ use Meritoo\Common\Type\DatePartType;
  */
 class DatePartTypeTest extends BaseTypeTestCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function getAllExpectedTypes()
-    {
-        return [
-            'DAY'    => DatePartType::DAY,
-            'HOUR'   => DatePartType::HOUR,
-            'MINUTE' => DatePartType::MINUTE,
-            'MONTH'  => DatePartType::MONTH,
-            'SECOND' => DatePartType::SECOND,
-            'YEAR'   => DatePartType::YEAR,
-        ];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getTestedTypeInstance()
-    {
-        return new DatePartType();
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -97,4 +74,27 @@ class DatePartTypeTest extends BaseTypeTestCase
             true,
         ];
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAllExpectedTypes()
+    {
+        return [
+            'DAY'    => DatePartType::DAY,
+            'HOUR'   => DatePartType::HOUR,
+            'MINUTE' => DatePartType::MINUTE,
+            'MONTH'  => DatePartType::MONTH,
+            'SECOND' => DatePartType::SECOND,
+            'YEAR'   => DatePartType::YEAR,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getTestedTypeInstance()
+    {
+        return new DatePartType();
+    }
 }

tests/Type/DatePeriodTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Type;
+namespace Meritoo\Test\Common\Type;
 
 use DateTime;
 use Generator;
@@ -214,34 +214,6 @@ class DatePeriodTest extends BaseTypeTestCase
         ];
     }
 
-    /**
-     * Returns all expected types of the tested type
-     *
-     * @return array
-     */
-    protected function getAllExpectedTypes()
-    {
-        return [
-            'LAST_MONTH' => DatePeriod::LAST_MONTH,
-            'LAST_WEEK'  => DatePeriod::LAST_WEEK,
-            'LAST_YEAR'  => DatePeriod::LAST_YEAR,
-            'NEXT_MONTH' => DatePeriod::NEXT_MONTH,
-            'NEXT_WEEK'  => DatePeriod::NEXT_WEEK,
-            'NEXT_YEAR'  => DatePeriod::NEXT_YEAR,
-            'THIS_MONTH' => DatePeriod::THIS_MONTH,
-            'THIS_WEEK'  => DatePeriod::THIS_WEEK,
-            'THIS_YEAR'  => DatePeriod::THIS_YEAR,
-        ];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getTestedTypeInstance()
-    {
-        return new DatePeriod();
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -277,4 +249,32 @@ class DatePeriodTest extends BaseTypeTestCase
             true,
         ];
     }
+
+    /**
+     * Returns all expected types of the tested type
+     *
+     * @return array
+     */
+    protected function getAllExpectedTypes()
+    {
+        return [
+            'LAST_MONTH' => DatePeriod::LAST_MONTH,
+            'LAST_WEEK'  => DatePeriod::LAST_WEEK,
+            'LAST_YEAR'  => DatePeriod::LAST_YEAR,
+            'NEXT_MONTH' => DatePeriod::NEXT_MONTH,
+            'NEXT_WEEK'  => DatePeriod::NEXT_WEEK,
+            'NEXT_YEAR'  => DatePeriod::NEXT_YEAR,
+            'THIS_MONTH' => DatePeriod::THIS_MONTH,
+            'THIS_WEEK'  => DatePeriod::THIS_WEEK,
+            'THIS_YEAR'  => DatePeriod::THIS_YEAR,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getTestedTypeInstance()
+    {
+        return new DatePeriod();
+    }
 }

tests/Utilities/Arrays/SimpleToString.php

@@ -0,0 +1,46 @@
+<?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\Test\Common\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;
+    }
+
+    /**
+     * Returns representation of object as string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return sprintf('Instance with ID: %s', $this->id);
+    }
+}

tests/Utilities/Bootstrap4CssSelectorTest.php

@@ -0,0 +1,185 @@
+<?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\Test\Common\Utilities;
+
+use Meritoo\Common\Test\Base\BaseTestCase;
+use Meritoo\Common\Utilities\Bootstrap4CssSelector;
+
+/**
+ * Test case of the useful methods related to CSS selectors and the Bootstrap4 (front-end component library)
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+class Bootstrap4CssSelectorTest extends BaseTestCase
+{
+    public function testConstructor()
+    {
+        static::assertHasNoConstructor(Bootstrap4CssSelector::class);
+    }
+
+    /**
+     * @param string $emptyValue Name of form (value of the "name" attribute)
+     * @dataProvider provideEmptyScalarValue
+     */
+    public function testGetRadioButtonErrorSelectorUsingEmptyFormName($emptyValue)
+    {
+        $fieldSetIndex = 1;
+        static::assertSame('', Bootstrap4CssSelector::getRadioButtonErrorSelector($emptyValue, $fieldSetIndex));
+    }
+
+    public function testGetRadioButtonErrorSelectorUsingNegativeFieldSetIndex()
+    {
+        static::assertSame('', Bootstrap4CssSelector::getRadioButtonErrorSelector('test-test', -1));
+    }
+
+    /**
+     * @param string $formName      Name of form (value of the "name" attribute)
+     * @param int    $fieldSetIndex Index/Position of the field-set
+     * @param string $expected      Expected selector
+     *
+     * @dataProvider provideFormNameFieldSetIndexAndSelector
+     */
+    public function testGetRadioButtonErrorSelector($formName, $fieldSetIndex, $expected)
+    {
+        static::assertSame($expected, Bootstrap4CssSelector::getRadioButtonErrorSelector($formName, $fieldSetIndex));
+    }
+
+    /**
+     * @param string $emptyValue Name of form (value of the "name" attribute)
+     * @dataProvider provideEmptyScalarValue
+     */
+    public function testGetFieldErrorSelectorUsingEmptyFormName($emptyValue)
+    {
+        $fieldName = 'test';
+        static::assertSame('', Bootstrap4CssSelector::getFieldErrorSelector($emptyValue, $fieldName));
+    }
+
+    /**
+     * @param string $emptyValue Name of field (value of the "name" attribute)
+     * @dataProvider provideEmptyScalarValue
+     */
+    public function testGetFieldErrorSelectorUsingEmptyFieldName($emptyValue)
+    {
+        $formName = 'test';
+        static::assertSame('', Bootstrap4CssSelector::getFieldErrorSelector($formName, $emptyValue));
+    }
+
+    /**
+     * @param string $formName  Name of form (value of the "name" attribute)
+     * @param string $fieldName Name of field (value of the "name" attribute)
+     * @param string $expected  Expected selector
+     *
+     * @dataProvider provideFormNameFieldNameAndSelector
+     */
+    public function testGetFieldErrorSelector($formName, $fieldName, $expected)
+    {
+        static::assertSame($expected, Bootstrap4CssSelector::getFieldErrorSelector($formName, $fieldName));
+    }
+
+    /**
+     * @param string $emptyValue Name of form (value of the "name" attribute)
+     * @dataProvider provideEmptyScalarValue
+     */
+    public function testGetFieldGroupSelectorUsingEmptyFormName($emptyValue)
+    {
+        static::assertSame('', Bootstrap4CssSelector::getFieldGroupSelector($emptyValue));
+    }
+
+    /**
+     * @param string $formName Name of form (value of the "name" attribute)
+     * @param string $expected Expected selector
+     *
+     * @dataProvider provideFormNameAndSelector
+     */
+    public function testGetFieldGroupSelector($formName, $expected)
+    {
+        static::assertSame($expected, Bootstrap4CssSelector::getFieldGroupSelector($formName));
+    }
+
+    public function testGetFieldErrorContainerSelector()
+    {
+        static::assertSame('.invalid-feedback .form-error-message', Bootstrap4CssSelector::getFieldErrorContainerSelector());
+    }
+
+    /**
+     * Provides name of form, index/position of the field-set and expected selector
+     *
+     * @return \Generator
+     */
+    public function provideFormNameFieldSetIndexAndSelector()
+    {
+        yield[
+            'test',
+            0,
+            'form[name="test"] fieldset:nth-of-type(0) legend.col-form-label .invalid-feedback .form-error-message',
+        ];
+
+        yield[
+            'test-123-test-456',
+            1,
+            'form[name="test-123-test-456"] fieldset:nth-of-type(1) legend.col-form-label .invalid-feedback .form-error-message',
+        ];
+
+        yield[
+            'test_something_098_different',
+            1245,
+            'form[name="test_something_098_different"] fieldset:nth-of-type(1245) legend.col-form-label .invalid-feedback .form-error-message',
+        ];
+    }
+
+    /**
+     * Provides name of form, name of field and expected selector
+     *
+     * @return \Generator
+     */
+    public function provideFormNameFieldNameAndSelector()
+    {
+        yield[
+            'test',
+            'test',
+            'form[name="test"] label[for="test"] .invalid-feedback .form-error-message',
+        ];
+
+        yield[
+            'test-123-test-456',
+            'great-000-field',
+            'form[name="test-123-test-456"] label[for="great-000-field"] .invalid-feedback .form-error-message',
+        ];
+
+        yield[
+            'test_something_098_different',
+            'this-is-the-123789-field',
+            'form[name="test_something_098_different"] label[for="this-is-the-123789-field"] .invalid-feedback .form-error-message',
+        ];
+    }
+
+    /**
+     * Provides name of form and expected selector
+     *
+     * @return \Generator
+     */
+    public function provideFormNameAndSelector()
+    {
+        yield[
+            'test',
+            'form[name="test"] .form-group',
+        ];
+
+        yield[
+            'test-123-test-456',
+            'form[name="test-123-test-456"] .form-group',
+        ];
+
+        yield[
+            'test_something_098_different',
+            'form[name="test_something_098_different"] .form-group',
+        ];
+    }
+}

tests/Utilities/BundleTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Utilities;
+namespace Meritoo\Test\Common\Utilities;
 
 use Generator;
 use Meritoo\Common\Exception\Bundle\IncorrectBundleNameException;

tests/Utilities/ComposerTest.php

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

tests/Utilities/CssSelectorTest.php

@@ -0,0 +1,296 @@
+<?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\Test\Common\Utilities;
+
+use Meritoo\Common\Test\Base\BaseTestCase;
+use Meritoo\Common\Utilities\CssSelector;
+
+/**
+ * Test case of the useful methods related to CSS selectors
+ *
+ * @author    Meritoo <github@meritoo.pl>
+ * @copyright Meritoo <http://www.meritoo.pl>
+ */
+class CssSelectorTest extends BaseTestCase
+{
+    public function testConstructor()
+    {
+        static::assertHasNoConstructor(CssSelector::class);
+    }
+
+    /**
+     * @param string $emptyValue Name of form (value of the "name" attribute)
+     * @dataProvider provideEmptyScalarValue
+     */
+    public function testGetFormByNameSelectorUsingEmptyName($emptyValue)
+    {
+        static::assertSame('', CssSelector::getFormByNameSelector($emptyValue));
+    }
+
+    /**
+     * @param string $formName Name of form (value of the "name" attribute)
+     * @param string $expected Expected selector
+     *
+     * @dataProvider provideFormNameAndSelector
+     */
+    public function testGetFormByNameSelector($formName, $expected)
+    {
+        static::assertSame($expected, CssSelector::getFormByNameSelector($formName));
+    }
+
+    /**
+     * @param string $emptyValue Name of form (value of the "name" attribute)
+     * @dataProvider provideEmptyScalarValue
+     */
+    public function testGetInputByNameSelectorUsingEmptyFormName($emptyValue)
+    {
+        $fieldName = 'test-test';
+        static::assertSame('', CssSelector::getInputByNameSelector($emptyValue, $fieldName));
+    }
+
+    /**
+     * @param string $emptyValue Name of field (value of the "name" attribute)
+     * @dataProvider provideEmptyScalarValue
+     */
+    public function testGetInputByNameSelectorUsingEmptyFieldName($emptyValue)
+    {
+        $formName = 'test-test';
+        static::assertSame('', CssSelector::getInputByNameSelector($formName, $emptyValue));
+    }
+
+    /**
+     * @param string $formName  Name of form (value of the "name" attribute)
+     * @param string $fieldName Name of field (value of the "name" attribute)
+     * @param string $expected  Expected selector
+     *
+     * @dataProvider provideFormNameFieldNameAndSelector
+     */
+    public function testGetInputByNameSelector($formName, $fieldName, $expected)
+    {
+        static::assertSame($expected, CssSelector::getInputByNameSelector($formName, $fieldName));
+    }
+
+    /**
+     * @param string $emptyValue Name of form (value of the "name" attribute)
+     * @dataProvider provideEmptyScalarValue
+     */
+    public function testGetInputByIdSelectorUsingEmptyFormName($emptyValue)
+    {
+        $fieldId = 'test-test';
+        static::assertSame('', CssSelector::getInputByIdSelector($emptyValue, $fieldId));
+    }
+
+    /**
+     * @param string $emptyValue ID of field (value of the "id" attribute)
+     * @dataProvider provideEmptyScalarValue
+     */
+    public function testGetInputByIdSelectorUsingEmptyFieldName($emptyValue)
+    {
+        $formName = 'test-test';
+        static::assertSame('', CssSelector::getInputByIdSelector($formName, $emptyValue));
+    }
+
+    /**
+     * @param string $formName Name of form (value of the "name" attribute)
+     * @param string $fieldId  ID of field (value of the "id" attribute)
+     * @param string $expected Expected selector
+     *
+     * @dataProvider provideFormNameFieldIdAndSelector
+     */
+    public function testGetInputByIdSelector($formName, $fieldId, $expected)
+    {
+        static::assertSame($expected, CssSelector::getInputByIdSelector($formName, $fieldId));
+    }
+
+    /**
+     * @param string $emptyValue Name of form (value of the "name" attribute)
+     * @dataProvider provideEmptyScalarValue
+     */
+    public function testGetLabelSelectorUsingEmptyFormName($emptyValue)
+    {
+        $fieldId = 'test-test';
+        static::assertSame('', CssSelector::getLabelSelector($emptyValue, $fieldId));
+    }
+
+    /**
+     * @param string $emptyValue ID of field (value of the "id" attribute)
+     * @dataProvider provideEmptyScalarValue
+     */
+    public function testGetLabelSelectorUsingEmptyFieldId($emptyValue)
+    {
+        $formName = 'test-test';
+        static::assertSame('', CssSelector::getLabelSelector($formName, $emptyValue));
+    }
+
+    /**
+     * @param string $formName Name of form (value of the "name" attribute)
+     * @param string $fieldId  ID of field (value of the "id" attribute)
+     * @param string $expected Expected selector
+     *
+     * @dataProvider provideFormNameFieldIdAndLabelSelector
+     */
+    public function testGetLabelSelector($formName, $fieldId, $expected)
+    {
+        static::assertSame($expected, CssSelector::getLabelSelector($formName, $fieldId));
+    }
+
+    /**
+     * @param string $emptyValue Name of form (value of the "name" attribute)
+     * @dataProvider provideEmptyScalarValue
+     */
+    public function testGetFieldSetByIndexSelectorUsingEmptyFormName($emptyValue)
+    {
+        $fieldSetIndex = 1;
+        static::assertSame('', CssSelector::getFieldSetByIndexSelector($emptyValue, $fieldSetIndex));
+    }
+
+    public function testGetFieldSetByIndexSelectorUsingNegativeFieldSetIndex()
+    {
+        static::assertSame('', CssSelector::getFieldSetByIndexSelector('test-test', -1));
+    }
+
+    /**
+     * @param string $formName      Name of form (value of the "name" attribute)
+     * @param int    $fieldSetIndex Index/Position of the field-set
+     * @param string $expected      Expected selector
+     *
+     * @dataProvider provideFormNameFieldSetIndexAndSelector
+     */
+    public function testGetFieldSetByIndexSelector($formName, $fieldSetIndex, $expected)
+    {
+        static::assertSame($expected, CssSelector::getFieldSetByIndexSelector($formName, $fieldSetIndex));
+    }
+
+    /**
+     * Provides name of form and selector of the form
+     *
+     * @return \Generator
+     */
+    public function provideFormNameAndSelector()
+    {
+        yield[
+            'test',
+            'form[name="test"]',
+        ];
+
+        yield[
+            'test-123-test-456',
+            'form[name="test-123-test-456"]',
+        ];
+
+        yield[
+            'test_something_098_different',
+            'form[name="test_something_098_different"]',
+        ];
+    }
+
+    /**
+     * Provides name of form, name of field and expected selector
+     *
+     * @return \Generator
+     */
+    public function provideFormNameFieldNameAndSelector()
+    {
+        yield[
+            'test',
+            'test',
+            'form[name="test"] input[name="test"]',
+        ];
+
+        yield[
+            'test-123-test-456',
+            'great-000-field',
+            'form[name="test-123-test-456"] input[name="great-000-field"]',
+        ];
+
+        yield[
+            'test_something_098_different',
+            'this-is-the-123789-field',
+            'form[name="test_something_098_different"] input[name="this-is-the-123789-field"]',
+        ];
+    }
+
+    /**
+     * Provides name of form, ID of field and expected selector of label
+     *
+     * @return \Generator
+     */
+    public function provideFormNameFieldIdAndLabelSelector()
+    {
+        yield[
+            'test',
+            'test',
+            'form[name="test"] label[for="test"]',
+        ];
+
+        yield[
+            'test-123-test-456',
+            'great-000-field',
+            'form[name="test-123-test-456"] label[for="great-000-field"]',
+        ];
+
+        yield[
+            'test_something_098_different',
+            'this-is-the-123789-field',
+            'form[name="test_something_098_different"] label[for="this-is-the-123789-field"]',
+        ];
+    }
+
+    /**
+     * Provides name of form, index/position of the field-set and expected selector
+     *
+     * @return \Generator
+     */
+    public function provideFormNameFieldSetIndexAndSelector()
+    {
+        yield[
+            'test',
+            0,
+            'form[name="test"] fieldset:nth-of-type(0)',
+        ];
+
+        yield[
+            'test-123-test-456',
+            1,
+            'form[name="test-123-test-456"] fieldset:nth-of-type(1)',
+        ];
+
+        yield[
+            'test_something_098_different',
+            1245,
+            'form[name="test_something_098_different"] fieldset:nth-of-type(1245)',
+        ];
+    }
+
+    /**
+     * Provides name of form, ID of field and expected selector
+     *
+     * @return \Generator
+     */
+    public function provideFormNameFieldIdAndSelector()
+    {
+        yield[
+            'test',
+            'test',
+            'form[name="test"] input#test',
+        ];
+
+        yield[
+            'test-123-test-456',
+            'great-000-field',
+            'form[name="test-123-test-456"] input#great-000-field',
+        ];
+
+        yield[
+            'test_something_098_different',
+            'this-is-the-123789-field',
+            'form[name="test_something_098_different"] input#this-is-the-123789-field',
+        ];
+    }
+}

tests/Utilities/DateTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Utilities;
+namespace Meritoo\Test\Common\Utilities;
 
 use DateInterval;
 use DateTime;
@@ -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));
     }
@@ -526,7 +680,8 @@ class DateTest extends BaseTestCase
     }
 
     /**
-     * @param int        $period   The period, type of period. One of DatePeriod class constants, e.g. DatePeriod::LAST_WEEK.
+     * @param int        $period   The period, type of period. One of DatePeriod class constants, e.g.
+     *                             DatePeriod::LAST_WEEK.
      * @param DatePeriod $expected Expected start and end date for given period
      *
      * @dataProvider provideCorrectPeriod
@@ -828,7 +983,9 @@ class DateTest extends BaseTestCase
             DatePeriod::NEXT_WEEK,
             new DatePeriod(
                 (new DateTime('this week'))->add(new DateInterval('P7D'))->setTime(0, 0, 0),
-                (new DateTime('this week'))->add(new DateInterval('P7D'))->add(new DateInterval('P6D'))->setTime(23, 59, 59)
+                (new DateTime('this week'))->add(new DateInterval('P7D'))
+                    ->add(new DateInterval('P6D'))
+                    ->setTime(23, 59, 59)
             ),
         ];
 

tests/Utilities/GeneratorUtilityTest.php

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

tests/Utilities/LocaleTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Utilities;
+namespace Meritoo\Test\Common\Utilities;
 
 use Generator;
 use Meritoo\Common\Test\Base\BaseTestCase;
@@ -80,8 +80,8 @@ class LocaleTest extends BaseTestCase
     }
 
     /**
-     * @param int    $category       Named constant specifying the category of the functions affected by the locale setting.
-     *                               It's the same constant as required by setlocale() function.
+     * @param int    $category       Named constant specifying the category of the functions affected by the locale
+     *                               setting. It's the same constant as required by setlocale() function.
      * @param string $languageCode   Language code, in ISO 639-1 format. Short form of the locale, e.g. "fr".
      * @param string $countryCode    Country code, in ISO 3166-1 alpha-2 format, e.g. "FR"
      * @param string $expectedLocale Expected locale

tests/Utilities/MimeTypesTest.php

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

tests/Utilities/MiscellaneousTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Utilities;
+namespace Meritoo\Test\Common\Utilities;
 
 use Generator;
 use Meritoo\Common\Exception\Regex\IncorrectColorHexLengthException;
@@ -14,7 +14,6 @@ use Meritoo\Common\Exception\Regex\InvalidColorHexValueException;
 use Meritoo\Common\Test\Base\BaseTestCase;
 use Meritoo\Common\Utilities\Locale;
 use Meritoo\Common\Utilities\Miscellaneous;
-use ReflectionException;
 use stdClass;
 
 /**
@@ -30,9 +29,6 @@ class MiscellaneousTest extends BaseTestCase
     private $stringDotSeparated;
     private $stringWithoutSpaces;
 
-    /**
-     * @throws ReflectionException
-     */
     public function testConstructor()
     {
         static::assertHasNoConstructor(Miscellaneous::class);
@@ -156,33 +152,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', dirname(__FILE__), '/../..'));
-            $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
@@ -253,57 +222,68 @@ class MiscellaneousTest extends BaseTestCase
         self::assertEquals($this->stringSmall, Miscellaneous::replace($this->stringSmall, $search, $replacement3, true));
     }
 
-    public function testReplace()
+    /**
+     * @param string       $description  Description of test
+     * @param string|array $subject      The string or an array of strings to search and replace
+     * @param string|array $search       String or pattern or array of patterns to find. It may be: string, an array
+     *                                   of strings or an array of patterns.
+     * @param string|array $replacement  The string or an array of strings to replace. It may be: string or an array
+     *                                   of strings.
+     * @param  mixed       $result       Result of replacing
+     *
+     * @dataProvider provideEmptyValuesToReplace
+     */
+    public function testReplaceUsingEmptyValues($description, $subject, $search, $replacement, $result)
     {
-        /*
-         * Common variables
-         */
-        $quoteStrings = true;
+        static::assertSame($result, Miscellaneous::replace($subject, $search, $replacement), $description);
+    }
 
-        $subject = [
-            $this->stringSmall,
-            $this->stringDotSeparated,
-        ];
+    /**
+     * @param string $description Description of test
+     * @param string $subject     The string or an array of strings to search and replace
+     * @param string $search      String or pattern or array of patterns to find. It may be: string, an array of
+     *                            strings or an array of patterns.
+     * @param string $replacement The string or an array of strings to replace. It may be: string or an array of
+     *                            strings.
+     * @param  mixed $result      Result of replacing
+     *
+     * @dataProvider provideStringsToReplace
+     */
+    public function testReplaceUsingStrings($description, $subject, $search, $replacement, $result)
+    {
+        static::assertSame($result, Miscellaneous::replace($subject, $search, $replacement), $description);
+    }
 
-        /*
-         * Testing replace with an array
-         */
-        $search = [
-            '|ipsum|',
-            '|pellentesque|',
-        ];
+    /**
+     * @param string $description Description of test
+     * @param string $subject     The string or an array of strings to search and replace
+     * @param string $search      String or pattern or array of patterns to find. It may be: string, an array of
+     *                            strings or an array of patterns.
+     * @param string $replacement The string or an array of strings to replace. It may be: string or an array of
+     *                            strings.
+     * @param  mixed $result      Result of replacing
+     *
+     * @dataProvider provideRegexToReplace
+     */
+    public function testReplaceUsingRegex($description, $subject, $search, $replacement, $result)
+    {
+        static::assertSame($result, Miscellaneous::replace($subject, $search, $replacement), $description);
+    }
 
-        $replacement = [
-            'commodo',
-            'interdum',
-        ];
-
-        $replaced1 = Miscellaneous::replace($subject, $search, $replacement);
-        $replaced2 = Miscellaneous::replace($subject, $search, $replacement, true);
-
-        self::assertEquals('Lorem commodo dolor sit amet.', $replaced1[0]);
-        self::assertEquals('Etiam ullamcorper. Suspendisse a interdum dui, non felis.', $replaced1[1]);
-
-        self::assertEquals('Lorem commodo dolor sit amet.', $replaced2[0]);
-        self::assertEquals('Etiam ullamcorper. Suspendisse a interdum dui, non felis.', $replaced2[1]);
-
-        /*
-         * Testing replace with string
-         */
-        $searchString = 'ipsum';
-        $replacementString = 'commodo';
-
-        $replaced = Miscellaneous::replace($subject, $searchString, $replacementString, $quoteStrings);
-        self::assertEquals('Lorem \'commodo\' dolor sit amet.', $replaced[0]);
-
-        /*
-         * Testing replace with mixed values:
-         * - subject: array
-         * - search: string
-         * - replacement: string
-         */
-        $replacedMixed = Miscellaneous::replace($subject, $searchString, $replacement, $quoteStrings);
-        self::assertEquals('Lorem \'commodo\' dolor sit amet.', $replacedMixed[0]);
+    /**
+     * @param string $description Description of test
+     * @param string $subject     The string or an array of strings to search and replace
+     * @param string $search      String or pattern or array of patterns to find. It may be: string, an array of
+     *                            strings or an array of patterns.
+     * @param string $replacement The string or an array of strings to replace. It may be: string or an array of
+     *                            strings.
+     * @param  mixed $result      Result of replacing
+     *
+     * @dataProvider provideDataToReplaceWithQuoteStrings
+     */
+    public function testReplaceWithQuoteStrings($description, $subject, $search, $replacement, $result)
+    {
+        static::assertSame($result, Miscellaneous::replace($subject, $search, $replacement, true), $description);
     }
 
     public function testUppercaseFirst()
@@ -348,7 +328,10 @@ class MiscellaneousTest extends BaseTestCase
 
     public function testGetOperatingSystemNameServer()
     {
-        self::assertEquals(php_uname('s'), Miscellaneous::getOperatingSystemNameServer());
+        /*
+         * While running Docker OS is a Linux
+         */
+        self::assertEquals('Linux', Miscellaneous::getOperatingSystemNameServer());
     }
 
     public function testSubstringToWord()
@@ -396,7 +379,7 @@ class MiscellaneousTest extends BaseTestCase
         mkdir($directory1Path, 0777, true);
         mkdir($directory2Path, 0777, true);
 
-        self::assertTrue(Miscellaneous::removeDirectory(sys_get_temp_dir() . '/lorem', false));
+        self::assertTrue(Miscellaneous::removeDirectory(sys_get_temp_dir() . '/lorem'));
     }
 
     /**
@@ -665,10 +648,6 @@ class MiscellaneousTest extends BaseTestCase
         self::assertEquals(255, Miscellaneous::getValidColorComponent(255, false));
     }
 
-    /**
-     * @throws IncorrectColorHexLengthException
-     * @throws InvalidColorHexValueException
-     */
     public function testGetInvertedColorWithIncorrectLength()
     {
         $this->setExpectedException(IncorrectColorHexLengthException::class);
@@ -683,10 +662,6 @@ class MiscellaneousTest extends BaseTestCase
         Miscellaneous::getInvertedColor('1234567');
     }
 
-    /**
-     * @throws IncorrectColorHexLengthException
-     * @throws InvalidColorHexValueException
-     */
     public function testGetInvertedColorWithInvalidValue()
     {
         $this->setExpectedException(InvalidColorHexValueException::class);
@@ -698,10 +673,6 @@ class MiscellaneousTest extends BaseTestCase
         Miscellaneous::getInvertedColor('00ppqq');
     }
 
-    /**
-     * @throws IncorrectColorHexLengthException
-     * @throws InvalidColorHexValueException
-     */
     public function testGetInvertedColor()
     {
         /*
@@ -1180,6 +1151,322 @@ class MiscellaneousTest extends BaseTestCase
         ];
     }
 
+    public function provideEmptyValuesToReplace()
+    {
+        yield[
+            'An empty string as subject',
+            '',
+            'test',
+            'another test',
+            '',
+        ];
+
+        yield[
+            'An empty array as subject',
+            [],
+            'test',
+            'another test',
+            [],
+        ];
+
+        yield[
+            'Null as subject',
+            null,
+            'test',
+            'another test',
+            null,
+        ];
+
+        yield[
+            'An empty string to search',
+            'test',
+            '',
+            'another test',
+            'test',
+        ];
+
+        yield[
+            'An empty array to search',
+            'test',
+            [],
+            'another test',
+            'test',
+        ];
+
+        yield[
+            'Null to search',
+            'test',
+            null,
+            'another test',
+            'test',
+        ];
+
+        yield[
+            'An empty string as replacement',
+            'test',
+            'another test',
+            '',
+            'test',
+        ];
+
+        yield[
+            'An empty array as replacement',
+            'test',
+            'another test',
+            [],
+            'test',
+        ];
+
+        yield[
+            'Null as replacement',
+            'test',
+            'another test',
+            null,
+            'test',
+        ];
+    }
+
+    public function provideStringsToReplace()
+    {
+        yield[
+            'Different count of strings to search and replace - 1st part',
+            'Lorem ipsum dolor sit amet',
+            [
+                'ipsum',
+            ],
+            'commodo',
+            'Lorem ipsum dolor sit amet',
+        ];
+
+        yield[
+            'Different count of strings to search and replace - 2nd part',
+            'Lorem ipsum dolor sit amet',
+            'ipsum',
+            [
+                'commodo',
+            ],
+            'Lorem commodo dolor sit amet',
+        ];
+
+        yield[
+            'Replace 1 not existing word in 1 sentence (nothing to replace)',
+            'Lorem ipsum dolor sit amet',
+            'plum',
+            'commodo',
+            'Lorem ipsum dolor sit amet',
+        ];
+
+        yield[
+            'Replace 1 word in 1 sentence',
+            'Lorem ipsum dolor sit amet',
+            'ipsum',
+            'commodo',
+            'Lorem commodo dolor sit amet',
+        ];
+
+        yield[
+            'Replace 1 not existing word in 2 sentences (nothing to replace)',
+            [
+                'Lorem ipsum dolor sit amet',
+                'Maecenas sed diam eget risus varius blandit sit amet',
+            ],
+            'plum',
+            'commodo',
+            [
+                'Lorem ipsum dolor sit amet',
+                'Maecenas sed diam eget risus varius blandit sit amet',
+            ],
+        ];
+
+        yield[
+            'Replace 1 word in 2 sentences',
+            [
+                'Lorem ipsum dolor sit amet',
+                'Maecenas sed diam eget risus varius blandit sit amet',
+            ],
+            'amet',
+            'commodo',
+            [
+                'Lorem ipsum dolor sit commodo',
+                'Maecenas sed diam eget risus varius blandit sit commodo',
+            ],
+        ];
+    }
+
+    public function provideRegexToReplace()
+    {
+        yield[
+            'Different count of strings to search and replace - 1st part',
+            'Lorem ipsum dolor sit amet',
+            [
+                '|ipsum|',
+            ],
+            'commodo',
+            'Lorem ipsum dolor sit amet',
+        ];
+
+        yield[
+            'Different count of strings to search and replace - 2nd part',
+            'Lorem ipsum dolor sit amet',
+            '|ipsum|',
+            [
+                'commodo',
+            ],
+            'Lorem ipsum dolor sit amet',
+        ];
+
+        yield[
+            '1 pattern (word -> "")',
+            'Lorem ipsum dolor sit amet',
+            '|ipsum|',
+            '',
+            'Lorem  dolor sit amet',
+        ];
+
+        yield[
+            '1 pattern (word -> word)',
+            'Lorem ipsum dolor sit amet',
+            '|ipsum|',
+            'commodo',
+            'Lorem commodo dolor sit amet',
+        ];
+
+        yield[
+            '2 patterns (word -> word)',
+            'Lorem ipsum dolor sit amet',
+            [
+                '|ipsum|',
+                '|amet|',
+            ],
+            [
+                'commodo',
+                'egestas',
+            ],
+            'Lorem commodo dolor sit egestas',
+        ];
+
+        yield[
+            '1 word in 2 sentences',
+            [
+                'Lorem ipsum dolor sit amet',
+                'Maecenas sed diam eget risus varius blandit sit amet',
+            ],
+            '|amet|',
+            'commodo',
+            [
+                'Lorem ipsum dolor sit commodo',
+                'Maecenas sed diam eget risus varius blandit sit commodo',
+            ],
+        ];
+
+        yield[
+            '2 words in 2 sentences',
+            [
+                'Lorem ipsum dolor sit amet',
+                'Maecenas sed diam eget risus varius blandit sit amet',
+            ],
+            [
+                '|ipsum|',
+                '|amet|',
+            ],
+            [
+                'commodo',
+                'egestas',
+            ],
+            [
+                'Lorem commodo dolor sit egestas',
+                'Maecenas sed diam eget risus varius blandit sit egestas',
+            ],
+        ];
+    }
+
+    public function provideDataToReplaceWithQuoteStrings()
+    {
+        yield[
+            'An empty string as subject',
+            '',
+            'test',
+            'another test',
+            '',
+        ];
+
+        yield[
+            'An empty string to search',
+            'test',
+            '',
+            'another test',
+            'test',
+        ];
+
+        yield[
+            'An empty string as replacement',
+            'test',
+            'another test',
+            '',
+            'test',
+        ];
+
+        yield[
+            'Replace 1 not existing word in 1 sentence (nothing to replace)',
+            'Lorem ipsum dolor sit amet',
+            'plum',
+            'commodo',
+            'Lorem ipsum dolor sit amet',
+        ];
+
+        yield[
+            'Replace 1 word in 1 sentence',
+            'Lorem ipsum dolor sit amet',
+            'ipsum',
+            'commodo',
+            'Lorem \'commodo\' dolor sit amet',
+        ];
+
+        yield[
+            'Replace 1 word in 2 sentences',
+            [
+                'Lorem ipsum dolor sit amet',
+                'Maecenas sed diam eget risus varius blandit sit amet',
+            ],
+            'amet',
+            'commodo',
+            [
+                'Lorem ipsum dolor sit \'commodo\'',
+                'Maecenas sed diam eget risus varius blandit sit \'commodo\'',
+            ],
+        ];
+
+        yield[
+            '1 pattern (word -> "")',
+            'Lorem ipsum dolor sit amet',
+            '|ipsum|',
+            '',
+            'Lorem \'\' dolor sit amet',
+        ];
+
+        yield[
+            '1 pattern (word -> word)',
+            'Lorem ipsum dolor sit amet',
+            '|ipsum|',
+            'commodo',
+            'Lorem \'commodo\' dolor sit amet',
+        ];
+
+        yield[
+            '2 patterns (word -> word)',
+            'Lorem ipsum dolor sit amet',
+            [
+                '|ipsum|',
+                '|amet|',
+            ],
+            [
+                'commodo',
+                'egestas',
+            ],
+            'Lorem \'commodo\' dolor sit \'egestas\'',
+        ];
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -1199,10 +1486,6 @@ class MiscellaneousTest extends BaseTestCase
     protected function tearDown()
     {
         parent::tearDown();
-
-        unset($this->stringSmall);
-        unset($this->stringCommaSeparated);
-        unset($this->stringDotSeparated);
-        unset($this->stringWithoutSpaces);
+        unset($this->stringSmall, $this->stringCommaSeparated, $this->stringDotSeparated, $this->stringWithoutSpaces);
     }
 }

tests/Utilities/QueryBuilderUtilityTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Test\Utilities;
+namespace Meritoo\Test\Common\Utilities;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManager;
@@ -260,7 +260,8 @@ class QueryBuilderUtilityTest extends BaseTestCase
         $entityManager
             ->expects(static::any())
             ->method('getExpressionBuilder')
-            ->willReturn(new Expr());
+            ->willReturn(new Expr())
+        ;
 
         yield[
             (new QueryBuilder($entityManager))->from('lorem_ipsum', 'lm'),

tests/Utilities/Reflection/A.php

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

tests/Utilities/Reflection/B.php

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

tests/Utilities/Reflection/C.php

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

tests/Utilities/Reflection/D.php

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

tests/Utilities/Reflection/E.php

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

tests/Utilities/Reflection/F.php

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

tests/Utilities/Reflection/G.php

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