test composer req

.docker/config/Dockerfile

@@ -0,0 +1,64 @@
+FROM php:5.5-cli
+
+#
+# Tools & libraries
+#
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        vim \
+        git \
+        zip \
+        unzip \
+        zlib1g-dev \
+        libicu-dev \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+#
+# PHP extensions
+#
+RUN docker-php-ext-install \
+    zip \
+    intl \
+    mbstring
+
+#
+# PHP configuration:
+# - default configuration
+# - timezone
+#
+COPY php.ini /usr/local/etc/php/php.ini
+ARG TIMEZONE
+RUN echo "\n""date.timezone = $TIMEZONE""\n" >> /usr/local/etc/php/php.ini
+
+#
+# Xdebug
+#
+RUN pecl install xdebug \
+    && docker-php-ext-enable xdebug
+COPY xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+
+#
+# Phing
+#
+RUN pear channel-discover pear.phing.info \
+    && pear install [--alldeps] phing/phing
+
+#
+# Composer + https://packagist.org/packages/hirak/prestissimo package
+#
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+    && php -r "if (hash_file('SHA384', 'composer-setup.php') === \
+    '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { 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');" \
+    && composer global require --no-plugins --no-scripts hirak/prestissimo \
+    && rm -rf /root/.composer/cache/*
+
+#
+# Bash
+#
+RUN sed -i 's/^# export/export/g' /root/.bashrc \
+    && sed -i 's/^# alias/alias/g' /root/.bashrc \
+    && echo "\n"'export PATH=/project/vendor/bin:$PATH'"\n" >> /root/.bashrc

.env

@@ -0,0 +1 @@
+TIMEZONE=Europe/Warsaw

.env.dist

@@ -1,15 +0,0 @@
-# -----------------------------------------------------------------------------
-### Docker
-# -----------------------------------------------------------------------------
-
-#
-# All containers
-#
-DOCKER_CONTAINER_OWNER=meritoo
-DOCKER_CONTAINER_PROJECT=common-library
-
-#
-# PHP configuration:
-# - timezone
-#
-TIMEZONE=Europe/Warsaw

.gitignore

@@ -1,65 +1,86 @@
-# ------------------------------------------------------------------------------
-### Environment-related parameters
-# ------------------------------------------------------------------------------
-.env
-
-
-# ------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 ### Vendors
-# ------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 /vendor/
 
 
-# ------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 ### Composer
-# ------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 /composer.lock
 /composer.phar
 
 
-# ------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 ### Phing
-# ------------------------------------------------------------------------------
-/phing/properties
+# ----------------------------------------------------------------------------------------------------------------------
+/.phing/properties
 
 
-# ------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 ### PHPUnit
-# ------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 /phpunit.xml
 
 
-# ------------------------------------------------------------------------------
-### PHP Coding Standards Fixer
-# ------------------------------------------------------------------------------
-/.php_cs
+# ----------------------------------------------------------------------------------------------------------------------
+### PHP Coding Standards Fixer generated files
+# ----------------------------------------------------------------------------------------------------------------------
 /.php_cs.cache
 
 
-# -----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 ### Build files
-# -----------------------------------------------------------------------------
-/build/
+# ----------------------------------------------------------------------------------------------------------------------
+/.build/
 
 
-# ------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 ### Generated databases
-# ------------------------------------------------------------------------------
-/data/tmp
+# ----------------------------------------------------------------------------------------------------------------------
+/.data/tmp
 *.sql
 *.sqlite
 
 
-# ------------------------------------------------------------------------------
-### JetBrains template
-# ------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
+### Compiled source
+# ----------------------------------------------------------------------------------------------------------------------
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+
+
+# ----------------------------------------------------------------------------------------------------------------------
+### Shell scripts
+# ----------------------------------------------------------------------------------------------------------------------
+/*.sh
+
+
+# ----------------------------------------------------------------------------------------------------------------------
+### JetBrains
+# ----------------------------------------------------------------------------------------------------------------------
 /.idea
 
 
-# ------------------------------------------------------------------------------
-### macOS template
-# ------------------------------------------------------------------------------
-# General
+# ----------------------------------------------------------------------------------------------------------------------
+### NetBeans template
+# ----------------------------------------------------------------------------------------------------------------------
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
+.nb-gradle/
+
+
+# ----------------------------------------------------------------------------------------------------------------------
+### OSX template
+# ----------------------------------------------------------------------------------------------------------------------
 .DS_Store
 .AppleDouble
 .LSOverride
@@ -77,7 +98,6 @@ Icon
 .TemporaryItems
 .Trashes
 .VolumeIcon.icns
-.com.apple.timemachine.donotpresent
 
 # Directories potentially created on remote AFP share
 .AppleDB
@@ -87,9 +107,9 @@ Temporary Items
 .apdisk
 
 
-# ------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 ### Linux template
-# ------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 *~
 
 # temporary files which can be created if a process still has a handle open of a deleted file
@@ -101,23 +121,16 @@ 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 thumbnail cache files
+# ----------------------------------------------------------------------------------------------------------------------
+# Windows image file caches
 Thumbs.db
 ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
 
 # Folder config file
-[Dd]esktop.ini
+Desktop.ini
 
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
@@ -125,7 +138,6 @@ $RECYCLE.BIN/
 # Windows Installer files
 *.cab
 *.msi
-*.msix
 *.msm
 *.msp
 

.phing/app.xml

@@ -0,0 +1,89 @@
+<?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"/>
+        <then>
+            <property file=".phing/properties" />
+        </then>
+        <else>
+            <property file=".phing/properties.dist" />
+        </else>
+    </if>
+
+    <!-- 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." />
+
+    <!-- Check / update composer -->
+    <target name="app:composer" description="Checks / updates composer">
+        <echo msg="Checking / updating composer..." />
+
+        <if>
+            <available file="composer.phar" />
+            <then>
+                <echo msg="[Skipped] Downloading of Composer skipped, because exist in the project..." />
+            </then>
+            <else>
+                <if>
+                    <os family="windows" />
+                    <then>
+                        <fail message="Composer not found! Go to http://getcomposer.org/download and download the Composer." />
+                    </then>
+                    <else>
+                        <exec command="${composer.download_command}" checkreturn="true" />
+                    </else>
+                </if>
+            </else>
+        </if>
+        <composer command="selfupdate" />
+    </target>
+
+    <!-- Project Install/update vendors -->
+    <target name="app:vendors" description="Installs / updates vendors">
+        <echo msg="Installing / updating vendors..." />
+
+        <if>
+            <istrue value="${composer.self-update}"/>
+            <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" />
+                </composer>
+            </then>
+            <else>
+                <composer php="${composer.php}" composer="${composer.path}" command="install" />
+            </else>
+        </if>
+    </target>
+
+    <!-- Checkout and finalization -->
+    <target name="app:checkout">
+        <tstamp>
+            <format property="date_end" pattern="%Y-%m-%d %H:%M" />
+        </tstamp>
+
+        <echo msg="------------------------------------" />
+        <echo msg="Build finished at: ${date_end}" />
+        <echo msg="------------------------------------" />
+    </target>
+</project>

.phing/properties.dist

@@ -0,0 +1,131 @@
+# --------------------------------------------------------------------------------
+# 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
+# --------------------------------------------------------------------------------
+
+# Default environment
+#
+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.
+# https://github.com/symfony/symfony/blob/master/UPGRADE-3.3.md#frameworkbundle
+#
+# Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+# 2017-06-06
+#
+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
+#
+composer.path = composer.phar
+#composer.path = /usr/local/bin/composer
+
+# 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.tests = ${project.basedir}/tests
+
+# --------------------------------------------------------------------------------
+# Build directories
+# --------------------------------------------------------------------------------
+
+dir.build = ${project.basedir}/.build
+dir.reports = ${dir.build}/logs
+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
+#
+# Krzysztof Niziol <krzysztof.niziol@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
+
+# --------------------------------------------------------------------------------
+# Testing
+# --------------------------------------------------------------------------------
+
+# Test database path
+#
+tests.database = ${dir.data.temporary}/database.sqlite
+
+#
+# Disabled, because unnecessary right now
+# PHPUnit is installed and loaded by Composer
+#
+# Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+# 2017-02-22
+#
+# Run PHPUnit using exec task instead of phpunitTask
+#phpunit.useExec = false
+
+#
+# Disabled, because unnecessary right now
+# We want generate code coverage always
+#
+# Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+# 2017-02-22
+#
+# Collect coverage data during tests
+#phpunit.withCoverage = true
+
+# Path of the PHPUnit (https://phpunit.de)
+#
+phpUnit.path = ./vendor/bin/phpunit
+
+# Path of the PHP Coding Standards Fixer (http://cs.sensiolabs.org)
+#
+phpCsFixer.path = ./vendor/bin/php-cs-fixer

.phing/tests.xml

@@ -0,0 +1,315 @@
+<?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.
+
+    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+    2017-02-23
+    -->
+    <autoloader />
+
+    <!-- Properties -->
+    <if>
+        <available file=".phing/properties" property="custom.properties.available"/>
+        <then>
+            <property file=".phing/properties" />
+        </then>
+        <else>
+            <property file=".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/**" />
+    </fileset>
+    <fileset id="tests" dir="${dir.tests}">
+        <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.*
+
+    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+    2017-02-22
+    -->
+
+    <!-- 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>
+
+    <!-- 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.*
+
+    Krzysztof Niziol <krzysztof.niziol@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" />
+
+    <!-- Test target -->
+    <target name="build:test"
+            depends="test:phpunit"
+            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.coverage}" />
+        <mkdir dir="${dir.reports.pdepend}" />
+    </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.*
+
+    Krzysztof Niziol <krzysztof.niziol@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>
+    -->
+
+    <!-- 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.
+
+    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+    2017-02-22
+    -->
+    <target name="check:cs" description="Checks coding standard">
+        <echo msg="Checking coding standard..." />
+        <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" />
+        </phpcodesniffer>
+    </target>
+
+    <!-- copy/paste detector -->
+    <target name="check:cpd" description="Checks similar code blocks.">
+        <echo msg="Checking similar code blocks..." />
+        <phpcpd>
+            <fileset refid="sourcecode" />
+            <formatter type="pmd" outfile="${dir.reports}/pmd-cpd.xml" />
+        </phpcpd>
+
+        <!--
+        Previous / old version
+
+        Krzysztof Niziol <krzysztof.niziol@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..." />
+        <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" />
+        </phpmd>
+    </target>
+
+    <!-- Code dependency -->
+    <target name="check:depend" description="Checks coupling and dependency">
+        <echo msg="Checking coupling and dependency..." />
+        <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" />
+        </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
+
+        Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+        2017-02-22
+
+        <exec command="phploc \-\-log-csv=${dir.reports}/phploc.csv ${dir.src}" />
+        -->
+    </target>
+
+    <!-- Unit tests -->
+    <target name="test:phpunit" description="Executes PHPUnit tests">
+        <!-- Check test database -->
+        <if>
+            <not>
+                <available file="${dir.data.tests}" type="dir" property="dir.data.tests.available" />
+            </not>
+            <then>
+                <mkdir dir="${dir.data.tests}" />
+            </then>
+        </if>
+        <if>
+            <not>
+                <available file="${tests.database}" property="tests.database.available" />
+            </not>
+            <then>
+                <touch file="${tests.database}" />
+            </then>
+        </if>
+        <echo msg="Running unit tests..." />
+        <coverage-setup database="${dir.reports.coverage}/coverage.db">
+            <fileset refid="sourcecode" />
+        </coverage-setup>
+        <exec command="${phpUnit.path} --verbose --configuration ${project.basedir}/phpunit.xml.dist" passthru="true" />
+        <!--
+        I have to use ExecTask to run PHPUnit instead of PHPUnitTask, because tests are not running if PHPUnitTask is
+        used (don't know why):
+        Total tests run: 0, Failures: 0, Errors: 0, Incomplete: 0, Skipped: 0
+
+        Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+        2017-02-23
+
+        <phpunit configuration="${project.basedir}/phpunit.xml.dist" printsummary="true">
+            <formatter type="xml" todir="${dir.reports}" outfile="phpunit.xml" />
+            <formatter type="plain" todir="${dir.reports}" outfile="phpunit.txt" />
+            <formatter type="clover" todir="${dir.reports.coverage}" />
+            <formatter type="summary" todir="${dir.reports}" outfile="phpunit_summary.txt" />
+        </phpunit>
+        -->
+
+        <!--
+        Previous / old version
+
+        Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+        2017-02-22
+
+        <if>
+            <istrue value="${phpunit.useExec}" />
+            <then>
+                <if>
+                    <istrue value="${phpunit.withCoverage}" />
+                    <then>
+                        <echo message="Running tests with code coverage..." />
+                        <exec command="phpunit \-\-log-junit ${dir.reports}/phpunit.xml \-\-coverage-clover ${dir.reports.coverage}/clover-coverage.xml \-\-coverage-crap4j ${dir.reports.coverage}/crap4j-coverage.xml \-\-coverage-html ${dir.reports.coverage}/ -c ${project.basedir} \-\-colors" passthru="true" checkreturn="true" />
+                    </then>
+                    <else>
+                        <echo message="Running tests without code coverage..." />
+                        <exec command="phpunit \-\-log-junit ${dir.reports}/phpunit.xml -c ${project.basedir} \-\-colors" passthru="true" checkreturn="true" />
+                    </else>
+                </if>
+            </then>
+            <else>
+                <if>
+                    <istrue value="${phpunit.withCoverage}" />
+                    <then>
+                        <echo message="Running tests with code coverage..." />
+                        <coverage-setup database="${dir.reports.coverage}/coverage.db">
+                            <fileset refid="sourcecode" />
+                        </coverage-setup>
+                        <phpunit printsummary="true" codecoverage="true">
+                            <formatter type="xml" todir="${dir.reports}" outfile="phpunit.xml" />
+                            <formatter type="plain" todir="${dir.reports}" outfile="phpunit.txt" />
+                            <formatter type="clover" todir="${dir.reports.coverage}" />
+                            <formatter type="summary" todir="${dir.reports}" outfile="phpunit_summary.txt" />
+                        </phpunit>
+                    </then>
+                    <else>
+                        <echo message="Running tests without code coverage..." />
+                        <phpunit printsummary="true">
+                            <formatter todir="${dir.reports}" type="xml" outfile="phpunit.xml" />
+                            <batchtest>
+                                <fileset refid="tests" />
+                            </batchtest>
+                        </phpunit>
+                    </else>
+                </if>
+            </else>
+        </if>
+        -->
+    </target>
+
+    <!-- Checkout and finalization -->
+    <target name="app:checkout">
+        <tstamp>
+            <format property="date_end" pattern="%Y-%m-%d %H:%M" />
+        </tstamp>
+
+        <echo msg="--------------------------------------------" />
+        <echo msg="Build tests finished at: ${date_end}" />
+        <echo msg="--------------------------------------------" />
+    </target>
+</project>

.php_cs.dist

@@ -1,6 +1,13 @@
 <?php
 
 $finder = PhpCsFixer\Finder::create()
+    /*
+     * Do not verify:
+     * - all DependencyInjection/Configuration classes: the Configuration.php files
+     * - autoloader from /app directory: autoload.php
+     */
+    ->notPath('/DependencyInjection\/Configuration\.php/')
+    ->notPath('/autoload\.php/')
     ->in([
         __DIR__ . '/src',
         __DIR__ . '/tests',
@@ -8,20 +15,16 @@ $finder = PhpCsFixer\Finder::create()
 
 return PhpCsFixer\Config::create()
     ->setRules([
-        '@Symfony'                            => true,
-        'binary_operator_spaces'              => [
+        '@Symfony'               => true,
+        'phpdoc_summary'         => false,
+        'phpdoc_separation'      => false,
+        'phpdoc_align'           => false,
+        'cast_spaces'            => false,
+        'binary_operator_spaces' => [
             'align_double_arrow' => true,
         ],
-        'blank_line_before_return'            => false,
-        'cast_spaces'                         => false,
-        'concat_space'                        => [
+        'concat_space'           => [
             'spacing' => 'one',
         ],
-        'phpdoc_add_missing_param_annotation' => true,
-        'phpdoc_align'                        => false,
-        'phpdoc_order'                        => true,
-        'phpdoc_separation'                   => false,
-        'phpdoc_summary'                      => false,
-        'trim_array_spaces'                   => false,
     ])
     ->setFinder($finder);

.styleci.yml

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

.travis.yml

@@ -4,14 +4,9 @@ php:
   - 5.6
   - 7.0
   - 7.1
-  - 7.2
-
-before_install:
-  - sudo locale-gen de_DE.UTF-8 es_ES.UTF-8 en_GB.UTF-8 en_US.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 pl_PL.UTF-8 ru_RU.UTF-8
-  - composer global require hirak/prestissimo
 
 install:
-  - travis_wait 30 composer install -v
+  - composer install
 
 script:
   - php ./vendor/bin/phpunit

CHANGELOG.md

@@ -1,83 +0,0 @@
-# Meritoo Common Library
-
-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
-2. ValueObject > class Version > represents version of software
-3. Move version of this package to `VERSION` file (from `composer.json` file)
-
-# 0.1.0
-
-1. Composer > support/require PHP 5.6+ (instead of 5.5.9+)
-2. Docker > rename `php-cli` service to `php`
-3. Exceptions > create instance of exception using static `create()` method (instead of constructor)
-4. Documentation > Exceptions
-
-# 0.0.21
-
-1. Composer > require ext-pcre
-2. Arrays > minor refactoring
-3. Update @author and @copyright in classes' descriptions
-
-# 0.0.20
-
-1. Collection > add() method > treat empty string as not provided index (same as null)
-
-# 0.0.19
-
-1. Add this changelog
-2. Reorganize documentation & update [Readme](README.md)
-3. Docker: use project-related binaries globally
-4. StyleCI & PHP Coding Standards Fixer: update configuration
-5. Documentation > Docker > add paragraph for PHP Coding Standards Fixer
-6. Coding standard > fix automatically
-7. StyleCI configuration > fix bug "The provided fixer 'binary_operator_spaces' cannot be enabled again because it was already enabled"
-8. StyleCI > disable & remove

README.md

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

VERSION

@@ -1 +0,0 @@
-0.1.8

build.xml

@@ -1,30 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <project name="Meritoo Package" basedir="." default="build:main" phingVersion="2.14.0">
     <!-- Properties -->
     <if>
-        <available file="${project.basedir}/phing/properties" property="custom.properties.available"/>
+        <available file=".phing/properties" property="custom.properties.available"/>
         <then>
-            <property file="${project.basedir}/phing/properties"/>
+            <property file=".phing/properties" />
         </then>
         <else>
-            <property file="${project.basedir}/phing/properties.dist"/>
+            <property file=".phing/properties.dist" />
         </else>
     </if>
 
     <!-- Default / main target -->
     <target name="build:main"
-            depends="build:app,
-                    build:tests"
-    />
+            depends="build:app, build:tests"
+            description="Builds everything and runs all tests" />
 
     <!-- Build app -->
-    <target name="build:app">
-        <phing phingfile="${project.basedir}/phing/app.xml" haltonfailure="true"/>
+    <target name="build:app" description="Prepares app to build and tests">
+        <phing phingfile=".phing/app.xml" haltonfailure="true" />
     </target>
 
     <!-- Build tests -->
-    <target name="build:tests">
-        <phing phingfile="${project.basedir}/phing/tests.xml" haltonfailure="true"/>
+    <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.
+
+        Krzysztof Niziol <krzysztof.niziol@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>
 </project>

composer.json

@@ -1,7 +1,8 @@
 {
-    "name": "meritoo/common-library",
+    "name": "wiosna-dev/common-library",
     "description": "Useful classes, methods, extensions etc.",
     "license": "MIT",
+    "version": "0.0.17",
     "authors": [
         {
             "name": "Meritoo.pl",
@@ -10,15 +11,10 @@
         }
     ],
     "require": {
-        "ext-dom": "*",
-        "ext-fileinfo": "*",
-        "ext-json": "*",
-        "ext-simplexml": "*",
-        "php": ">=5.6",
-        "ext-intl": "*",
-        "ext-pcre": "*",
+        "php": ">=5.5.9",
         "doctrine/orm": "^2.5",
-        "gedmo/doctrine-extensions": "^2.4"
+        "gedmo/doctrine-extensions": "^2.4",
+        "symfony/http-foundation": "^3.3"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.2",
@@ -36,7 +32,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Meritoo\\Test\\Common\\": "tests/"
+            "Meritoo\\Common\\Test\\": "tests/"
         }
     },
     "config": {

docker-compose.yml

@@ -1,33 +1,15 @@
 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
+    php-cli:
+        image: meritoo/common-library
+        container_name: meritoo-common-library
+        working_dir: /project
         entrypoint: php
         command: -S 0.0.0.0:9999
         build:
-            context: ./docker/config
+            context: ./.docker/config
             args:
-                - TIMEZONE=${TIMEZONE}
+                - TIMEZONE=$TIMEZONE
         volumes:
-            - .:/project:cached
-    composer:
-        image: ${DOCKER_CONTAINER_OWNER}/${DOCKER_CONTAINER_PROJECT}-php
-        container_name: ${DOCKER_CONTAINER_OWNER}-${DOCKER_CONTAINER_PROJECT}-composer
-        entrypoint: php -d memory_limit=-1 /usr/local/bin/composer
-        volumes:
-            - .:/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
+            - .:/project

docker/config/Dockerfile

@@ -1,131 +0,0 @@
-FROM php:5.6-cli
-MAINTAINER Meritoo <github@meritoo.pl>
-
-#
-# Tools & libraries
-#
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-        vim \
-        git \
-        unzip \
-        libicu-dev \
-        locales \
-    && apt-get clean \
-    && rm -rf \
-        /var/lib/apt/lists/* \
-        /tmp/* \
-        /var/tmp/*
-
-#
-# Generating locales:
-# - de_DE
-# - es_ES
-# - en_GB
-# - en_US
-# - fr_FR
-# - it_IT
-# - pl_PL
-# - ru_RU
-#
-RUN sed -i 's/^# de_DE/de_DE/g; \
-            s/^# es_ES/es_ES/g; \
-            s/^# en_GB/en_GB/g; \
-            s/^# en_US/en_US/g; \
-            s/^# fr_FR/fr_FR/g; \
-            s/^# it_IT/it_IT/g; \
-            s/^# pl_PL/pl_PL/g; \
-            s/^# ru_RU/ru_RU/g;' /etc/locale.gen \
-    && locale-gen
-
-#
-# Set default language
-#
-# Required to avoid problem with using strange language by error messages.
-# Example: "chmod(): Aucun fichier ou dossier de ce type"
-#
-ENV LANGUAGE=en_US.UTF-8
-
-#
-# PHP extensions
-#
-RUN docker-php-ext-install \
-    intl \
-    mbstring
-
-#
-# PHP extensions (PECL):
-# - Xdebug
-#
-RUN pecl install \
-        xdebug-2.5.5 \
-    && docker-php-ext-enable \
-        xdebug
-
-COPY xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-
-#
-# PHP configuration:
-# - default configuration
-# - timezone
-#
-COPY php.ini /usr/local/etc/php/php.ini
-ARG TIMEZONE
-RUN ln -snf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime \
-    && echo ${TIMEZONE} > /etc/timezone \
-    && printf '[PHP]\ndate.timezone = "%s"\n' ${TIMEZONE} > /usr/local/etc/php/conf.d/tzone.ini \
-    && "date"
-#RUN echo "\n""date.timezone = $TIMEZONE""\n" >> /usr/local/etc/php/php.ini
-
-#
-# Phing
-#
-RUN pear channel-discover pear.phing.info \
-    && pear install [--alldeps] phing/phing
-
-#
-# Composer - environment variables:
-# - disable warning about running commands as root/super user
-# - disable automatic clearing of sudo sessions
-#
-# More:
-# https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
-#
-ENV COMPOSER_ALLOW_SUPERUSER 1
-
-#
-# Composer + https://packagist.org/packages/hirak/prestissimo package
-#
-RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-    && php -r "if (hash_file('SHA384', 'composer-setup.php') === \
-        '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');" \
-    && composer global require \
-        --no-plugins \
-        --no-scripts \
-        --no-progress \
-        --no-suggest \
-        --no-interaction \
-        --prefer-dist \
-        --optimize-autoloader \
-        --classmap-authoritative \
-        hirak/prestissimo \
-    && rm -rf ~/.composer/cache/* \
-    && composer clear-cache \
-    && composer --version
-
-#
-# Bash
-#
-RUN sed -i 's/^# export/export/g; \
-            s/^# alias/alias/g;' ~/.bashrc \
-    && echo 'COLUMNS=200'"\n" >> ~/.bashrc
-
-#
-# Use project-related binaries globally
-#
-ENV PATH="/project/vendor/bin:${PATH}"
-
-WORKDIR /project

docs/Base-test-case.md

@@ -1,55 +0,0 @@
-# Meritoo Common Library
-
-Common and useful classes, methods, exceptions etc.
-
-# Base test case (with common methods and data providers)
-
-Located here: `Meritoo\Common\Test\Base\BaseTestCase`. Just extend the `BaseTestCase` class and use it like in `Meritoo\Common\Test\Utilities\DateTest` class:
-
-```php
-class DateTest extends BaseTestCase
-{
-    /**
-     * @param mixed $value Empty value, e.g. ""
-     * @dataProvider provideEmptyValue
-     */
-    public function testGetDateTimeEmptyValue($value)
-    {
-        self::assertFalse(Date::getDateTime($value));
-    }
-
-	(...)
-}
-```
-
-or in `Meritoo\Common\Test\Utilities\MimeTypesTest` class:
-
-```php
-class MimeTypesTest extends BaseTestCase
-{
-	(...)
-
-    /**
-     * @param bool $mimeType The mime type, e.g. "video/mpeg"
-     * @dataProvider provideBooleanValue
-     */
-    public function testGetExtensionBooleanMimeType($mimeType)
-    {
-        self::assertEquals('', MimeTypes::getExtension($mimeType));
-    }
-
-	(...)
-}
-```
-
-# 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)
-
-[‹ Back to `Readme`](../README.md)

docs/Collection-of-elements.md

@@ -1,53 +0,0 @@
-# Meritoo Common Library
-
-Common and useful classes, methods, exceptions etc.
-
-# Collection of elements
-
-Located here: `Meritoo\Common\Collection\Collection`. It's a set of some elements, e.g. objects. It's iterable and countable. Provides very useful methods. Some of them:
-- `getFirst()` - returns the first element in the collection
-- `getLast()` - returns the last element in the collection
-- `isEmpty()` - returns information if collection is empty
-- `add($element, $index = null)` - adds given element (at the end of collection)
-- `addMultiple($elements, $useIndexes = false)` - adds given elements (at the end of collection)
-- `prepend($element)` - prepends given element (adds given element at the beginning of collection)
-- `remove($element)` - removes given element
-
-Examples of usage below.
-
-### An empty collection
-
-```php
-use Meritoo\Common\Collection\Collection;
-
-$emptyCollection = new Collection();
-var_dump($emptyCollection->isEmpty()); // bool(true)
-```
-
-### Simple collection
-
-```php
-use Meritoo\Common\Collection\Collection;
-
-$elements = [
-    'lorem',
-    'ipsum',
-    123 => 'dolor',
-    345 => 'sit',
-];
-
-$simpleCollection = new Collection($elements);
-var_dump($simpleCollection->has('dolor')); // bool(true)
-```
-
-# 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)
-
-[‹ Back to `Readme`](../README.md)

docs/Development.md

@@ -1,123 +0,0 @@
-# Meritoo Common Library
-
-Development-related information
-
-# Requirements
-
-* [Docker](https://www.docker.com)
-* Your favourite IDE :)
-
-# Getting started
-
-1. Build, create and start Docker's containers by running command:
-
-    ```bash
-    docker-compose up -d
-    ```
-
-2. Rebuild project by running command (installs packages, prepares required directories and runs tests):
-
-	```bash
-	docker-compose exec php phing
-	```
-
-> [What is Docker?](https://www.docker.com/what-docker)
-
-# Composer
-
-Available as `composer` service. You can run any Composer's command using the `composer` service:
-
-```bash
-docker-compose run --rm composer [command]
-```
-
-Examples below.
-
-##### Install packages
-
-```bash
-docker-compose run --rm composer install
-```
-
-##### Update packages
-
-```bash
-docker-compose run --rm composer update
-```
-
-##### Add package
-
-```bash
-docker-compose run --rm composer require [vendor]/[package]
-```
-
-##### Remove package
-
-```bash
-docker-compose run --rm composer remove [vendor]/[package]
-```
-
-# Coding Standards Fixer
-
-Fix coding standard by running command:
-
-```bash
-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
-docker-compose exec php rm .php_cs.cache && docker-compose exec php php-cs-fixer fix
-```
-
-> [Want more?](https://cs.sensiolabs.org)
-
-# Tests
-
-### Prerequisites
-
-Install required packages by running command: `docker-compose run --rm composer install`.
-
-### Running [PHPUnit](https://phpunit.de) tests
-
-##### Easy (with code coverage)
-
-```bash
-docker-compose run --rm phpunit --verbose
-```
-
-or
-
-```bash
-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:
-
-```bash
-docker-compose exec php phing
-```
-
-[‹ Back to `Readme`](../README.md)

docs/Exceptions.md

@@ -1,64 +0,0 @@
-# Meritoo Common Library
-
-Common and useful classes, methods, exceptions etc.
-
-# Exceptions
-
-### Create instance of exception
-
-This package contains a lot of exceptions. Each of them contains static method `create()` with proper arguments that is used to create instance of the exception. Example:
-
-```php
-use Meritoo\Common\Exception\Bundle\IncorrectBundleNameException;
-throw IncorrectBundleNameException::create('RisusIpsum');
-```
-
-### Base exception for unknown type of something
-
-##### Short description
-
-It's a `Meritoo\Common\Exception\Base\UnknownTypeException` class. Related to `Meritoo\Common\Type\Base\BaseType` class that represents type of something, e.g. type of button, order.
-
-##### Usage
-
-You can extend `Meritoo\Common\Exception\Base\UnknownTypeException` class and create your own static method, e.g. `createException()`, which will be used create instance of the exception. Inside the `createException()` method you can call `parent::create()` method.
-
-##### Example
-
-```php
-<?php
-
-namespace Your\Package\Exception\Type;
-
-use Meritoo\Common\Exception\Base\UnknownTypeException;
-use Your\Package\Type\SimpleType;
-
-class UnknownSimpleTypeException extends UnknownTypeException
-{
-    /**
-     * Creates exception
-     *
-     * @param string $unknownType Unknown and simple type
-     * @return UnknownSimpleTypeException
-     */
-    public static function createException($unknownType)
-    {
-        /* @var UnknownSimpleTypeException $exception */
-        $exception = parent::create($unknownType, new SimpleType(), 'my simple type of something');
-
-        return $exception;
-    }
-}
-```
-
-# 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)

docs/Static-methods.md

@@ -1,26 +0,0 @@
-# Meritoo Common Library
-
-Common and useful classes, methods, exceptions etc.
-
-# Static methods
-
-This package contains a lot of class with static methods, so usage is not so complicated. Just run the static method who would you like to use. Example:
-
-```php
-use Meritoo\Common\Utilities\Arrays;
-
-$firstElement = Arrays::getFirstElement(['lorem', 'ipsum']);
-var_dump($firstElement); // string(5) "lorem"
-```
-
-# 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)
-
-[‹ Back to `Readme`](../README.md)

docs/Static-methods/Arrays.md

@@ -1,78 +0,0 @@
-# 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

@@ -1,45 +0,0 @@
-# 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

@@ -1,303 +0,0 @@
-# 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,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="Meritoo Package" basedir="." default="build:main" phingVersion="2.16.0">
-    <!-- Properties -->
-    <if>
-        <available file="${project.basedir}/phing/properties" property="custom.properties.available"/>
-        <then>
-            <property file="${project.basedir}/phing/properties"/>
-        </then>
-        <else>
-            <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"
-    />
-
-    <!-- App target -->
-    <target name="build:app"
-            depends="app:clean,
-                    app:composer:self-update,
-                    app:composer:install,
-                    app:composer:validate,
-                    app:checkout"
-    />
-
-    <!-- Updates Composer -->
-    <target name="app:composer:self-update">
-        <if>
-            <not>
-                <available file="${composer.path}" property="composer.local.unavailable"/>
-            </not>
-            <then>
-                <if>
-                    <os family="windows"/>
-                    <then>
-                        <fail message="Composer not found! Go to http://getcomposer.org/download and download the Composer."/>
-                    </then>
-                    <else>
-                        <exec command="${composer.download_command}" checkreturn="true" passthru="true"/>
-                    </else>
-                </if>
-            </then>
-        </if>
-
-        <!-- Update Composer -->
-        <composer php="${composer.php}" composer="${composer.path}" command="selfupdate">
-            <arg value="--ansi"/>
-        </composer>
-    </target>
-
-    <!-- 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>
-            <equals arg1="${env}" arg2="prod"/>
-            <then>
-                <echo message="[Skipped] Cleaning project (and directories cleanup) -> 'prod' environment"/>
-            </then>
-            <else>
-                <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"/>
-        </tstamp>
-
-        <echo msg="------------------------------------"/>
-        <echo msg="Build finished at: ${date_end}"/>
-        <echo msg="------------------------------------"/>
-    </target>
-</project>

phing/composer-install.sh

@@ -1,20 +0,0 @@
-#!/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

@@ -1,36 +0,0 @@
-<?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,82 +0,0 @@
-# --------------------------------------------------------------------------------
-# Common, e.g. default environment
-# --------------------------------------------------------------------------------
-
-# Default environment
-#
-env = dev
-
-# 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.
-# https://github.com/symfony/symfony/blob/master/UPGRADE-3.3.md#frameworkbundle
-#
-# Meritoo <github@meritoo.pl>
-# 2017-06-06
-#
-cache.clearWithWarmup = false
-
-# --------------------------------------------------------------------------------
-# Composer
-# --------------------------------------------------------------------------------
-
-# Command used to download 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
-
-# --------------------------------------------------------------------------------
-# Directories
-# --------------------------------------------------------------------------------
-
-# System directories
-#
-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}/reports
-dir.reports.pdepend = ${dir.reports}/pdepend
-dir.reports.coverage = ${dir.reports}/phpunit_coverage
-
-# 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 PHP Coding Standards Fixer (http://cs.sensiolabs.org)
-#
-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,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="Meritoo Package" basedir="." default="build:main" phingVersion="2.16.0">
-    <autoloader/>
-
-    <!-- Properties -->
-    <if>
-        <available file="${project.basedir}/phing/properties" property="custom.properties.available"/>
-        <then>
-            <property file="${project.basedir}/phing/properties"/>
-        </then>
-        <else>
-            <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/**"/>
-    </fileset>
-    <fileset id="tests" dir="${dir.tests}">
-        <include name="**/*Test*.php"/>
-    </fileset>
-
-    <!-- Default / main target -->
-    <target name="build:main"
-            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">
-        <exec command="${tests.cs_fixer.command}" passthru="true"/>
-    </target>
-
-    <!-- Check target -->
-    <target name="build:check"
-            depends="check:cs,
-                    check:md,
-                    check:cpd,
-                    check:depend,
-                    check:loc"
-    />
-
-    <!-- Test target -->
-    <target name="build:test"
-            depends="test:phpunit"
-    />
-
-    <!-- Symfony2 code sniffer -->
-    <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"/>
-        </phpcodesniffer>
-    </target>
-
-    <!-- copy/paste detector -->
-    <target name="check:cpd" depends="build:prepare">
-        <phpcpd>
-            <fileset refid="sourcecode"/>
-            <formatter type="pmd" outfile="${dir.reports}/pmd-cpd.xml"/>
-        </phpcpd>
-    </target>
-
-    <!-- Mess detector -->
-    <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"/>
-        </phpmd>
-    </target>
-
-    <!-- Code 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"/>
-        </phpdepend>
-    </target>
-
-    <!-- Measure the size and analyzing the structure of a project -->
-    <target name="check:loc" depends="build:prepare">
-        <phploc reportType="txt" reportName="phploc" reportDirectory="${dir.reports}">
-            <fileset refid="sourcecode"/>
-        </phploc>
-    </target>
-
-    <!-- PHPUnit tests -->
-    <target name="test:phpunit" depends="build:prepare">
-        <exec command="${tests.phpunit.command}" passthru="true"/>
-    </target>
-
-    <!-- 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"/>
-        </tstamp>
-
-        <echo msg="--------------------------------------------"/>
-        <echo msg="Build tests finished at: ${date_end}"/>
-        <echo msg="--------------------------------------------"/>
-    </target>
-</project>

phpunit.xml.dist

@@ -1,30 +1,35 @@
 <?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"
-        bootstrap="vendor/autoload.php"
-        colors="true"
-        verbose="true"
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="true"
+         bootstrap="./vendor/autoload.php"
 >
-    <php>
-        <ini name="error_reporting" value="-1"/>
-    </php>
-
     <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/reports/phpunit_coverage/html"/>
+        <log type="coverage-html" target="./.build/logs/phpunit_coverage/html" />
     </logging>
 </phpunit>

src/Collection/Collection.php

@@ -9,20 +9,26 @@
 namespace Meritoo\Common\Collection;
 
 use ArrayAccess;
+use ArrayIterator;
 use Countable;
 use IteratorAggregate;
-use Meritoo\Common\Traits\CollectionTrait;
+use Meritoo\Common\Utilities\Arrays;
 
 /**
  * Collection of elements.
  * It's a set of some elements, e.g. objects.
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class Collection implements Countable, ArrayAccess, IteratorAggregate
 {
-    use CollectionTrait;
+    /**
+     * The elements of collection
+     *
+     * @var array
+     */
+    private $elements;
 
     /**
      * Class constructor
@@ -33,4 +39,246 @@ 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) {
+            $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

@@ -15,28 +15,27 @@ use Meritoo\Common\Utilities\Arrays;
 /**
  * An exception used while type of something is unknown
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 abstract class UnknownTypeException extends Exception
 {
     /**
-     * Creates exception
+     * Class constructor
      *
-     * @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
+     * @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
      */
-    public static function create($unknownType, BaseType $typeInstance, $typeName)
+    public function __construct($unknownType, BaseType $typeInstance, $typeName)
     {
+        $allTypes = $typeInstance->getAll();
+        $types = Arrays::values2string($allTypes, '', ', ');
+
         $template = 'The \'%s\' type of %s is unknown. Probably doesn\'t exist or there is a typo. You should use one'
             . ' of these types: %s.';
 
-        $allTypes = $typeInstance->getAll();
-        $types = Arrays::values2string($allTypes, '', ', ');
-        $message = sprintf($template, $unknownType, $typeName, $types);
-
-        return new static($message);
+        $message = sprintf(sprintf($template, $unknownType, $typeName, $types));
+        parent::__construct($message);
     }
 }

src/Exception/Bundle/IncorrectBundleNameException.php

@@ -1,36 +0,0 @@
-<?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\Bundle;
-
-use Exception;
-
-/**
- * An exception used while name of bundle is incorrect
- *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
- */
-class IncorrectBundleNameException extends Exception
-{
-    /**
-     * Creates exception
-     *
-     * @param string $bundleName Incorrect name of bundle
-     * @return IncorrectBundleNameException
-     */
-    public static function create($bundleName)
-    {
-        $template = 'Name of bundle \'%s\' is incorrect. It should start with big letter and end with "Bundle". Is'
-            . ' there everything ok?';
-
-        $message = sprintf($template, $bundleName);
-
-        return new static($message);
-    }
-}

src/Exception/Date/UnknownDatePartTypeException.php

@@ -0,0 +1,32 @@
+<?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\Date;
+
+use Meritoo\Common\Exception\Base\UnknownTypeException;
+use Meritoo\Common\Type\DatePartType;
+
+/**
+ * An exception used while type of date part, e.g. "year", is unknown
+ *
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
+ */
+class UnknownDatePartTypeException extends UnknownTypeException
+{
+    /**
+     * Class constructor
+     *
+     * @param string $unknownDatePart Type of date part, e.g. "year". One of DatePartType class constants.
+     * @param string $value           Incorrect value
+     */
+    public function __construct($unknownDatePart, $value)
+    {
+        parent::__construct($unknownDatePart, new DatePartType(), sprintf('date part (with value %s)', $value));
+    }
+}

src/Exception/File/EmptyFileException.php

@@ -11,22 +11,21 @@ namespace Meritoo\Common\Exception\File;
 /**
  * An exception used while file with given path is empty (has no content)
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class EmptyFileException extends \Exception
 {
     /**
-     * Creates exception
+     * Class constructor
      *
      * @param string $emptyFilePath Path of the empty file
-     * @return EmptyFileException
      */
-    public static function create($emptyFilePath)
+    public function __construct($emptyFilePath)
     {
         $template = 'File with path \'%s\' is empty (has no content). Did you provide path of proper file?';
         $message = sprintf($template, $emptyFilePath);
 
-        return new static($message);
+        parent::__construct($message);
     }
 }

src/Exception/File/EmptyFilePathException.php

@@ -11,16 +11,16 @@ namespace Meritoo\Common\Exception\File;
 /**
  * An exception used while path of given file is empty
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class EmptyFilePathException extends \Exception
 {
     /**
-     * Creates exception
+     * Class constructor
      */
-    public static function create()
+    public function __construct()
     {
-        return new static('Path of the file is empty. Did you provide path of proper file?');
+        parent::__construct('Path of the file is empty. Did you provide path of proper file?');
     }
 }

src/Exception/File/NotExistingFileException.php

@@ -11,22 +11,21 @@ namespace Meritoo\Common\Exception\File;
 /**
  * An exception used while file with given path does not exist
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class NotExistingFileException extends \Exception
 {
     /**
-     * Creates exception
+     * Class constructor
      *
      * @param string $notExistingFilePath Path of not existing (or not readable) file
-     * @return NotExistingFileException
      */
-    public static function create($notExistingFilePath)
+    public function __construct($notExistingFilePath)
     {
         $template = 'File with path \'%s\' does not exist (or is not readable). Did you provide path of proper file?';
         $message = sprintf($template, $notExistingFilePath);
 
-        return new static($message);
+        parent::__construct($message);
     }
 }

src/Exception/Method/DisabledMethodException.php

@@ -13,28 +13,26 @@ use Exception;
 /**
  * An exception used while method cannot be called, because is disabled
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class DisabledMethodException extends Exception
 {
     /**
-     * Creates exception
+     * Class constructor
      *
      * @param string $disabledMethod    Name of the disabled method
      * @param string $alternativeMethod (optional) Name of the alternative method
-     * @return DisabledMethodException
      */
-    public static function create($disabledMethod, $alternativeMethod = '')
+    public function __construct($disabledMethod, $alternativeMethod = '')
     {
         $template = 'Method %s() cannot be called, because is disabled.';
-        $message = sprintf($template, $disabledMethod);
 
         if (!empty($alternativeMethod)) {
-            $template = '%s Use %s() instead.';
-            $message = sprintf($template, $message, $alternativeMethod);
+            $template .= ' Use %s() instead.';
         }
 
-        return new static($message);
+        $message = sprintf($template, $disabledMethod, $alternativeMethod);
+        parent::__construct($message);
     }
 }

src/Exception/Reflection/CannotResolveClassNameException.php

@@ -13,21 +13,20 @@ use Exception;
 /**
  * An exception used while name of class or trait cannot be resolved
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class CannotResolveClassNameException extends Exception
 {
     /**
-     * Creates exception
+     * Class constructor
      *
      * @param array|object|string $source   Source of the class's / trait's name. It can be an array of objects,
      *                                      namespaces, object or namespace.
      * @param bool                $forClass (optional) If is set to true, message of this exception for class is
      *                                      prepared. Otherwise - for trait.
-     * @return CannotResolveClassNameException
      */
-    public static function create($source, $forClass = true)
+    public function __construct($source, $forClass = true)
     {
         $forWho = 'trait';
         $value = '';
@@ -43,6 +42,6 @@ class CannotResolveClassNameException extends Exception
         $template = 'Name of %s from given \'%s\'%s cannot be resolved. Is there everything ok?';
         $message = sprintf($template, $forWho, gettype($source), $value);
 
-        return new static($message);
+        parent::__construct($message);
     }
 }

src/Exception/Reflection/MissingChildClassesException.php

@@ -14,19 +14,18 @@ use Meritoo\Common\Utilities\Reflection;
 /**
  * An exception used while given class has no child classes
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class MissingChildClassesException extends Exception
 {
     /**
-     * Creates exception
+     * Class constructor
      *
      * @param array|object|string $parentClass Class that hasn't child classes, but it should. An array of objects,
      *                                         strings, object or string.
-     * @return MissingChildClassesException
      */
-    public static function create($parentClass)
+    public function __construct($parentClass)
     {
         $template = 'The \'%s\' class requires one child class at least who will extend her (maybe is an abstract'
             . ' class), but the child classes are missing. Did you forget to extend this class?';
@@ -34,6 +33,6 @@ class MissingChildClassesException extends Exception
         $parentClassName = Reflection::getClassName($parentClass);
         $message = sprintf($template, $parentClassName);
 
-        return new static($message);
+        parent::__construct($message);
     }
 }

src/Exception/Reflection/NotExistingPropertyException.php

@@ -1,33 +0,0 @@
-<?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/Reflection/TooManyChildClassesException.php

@@ -14,20 +14,19 @@ use Meritoo\Common\Utilities\Reflection;
 /**
  * An exception used while given class has more than one child class
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class TooManyChildClassesException extends Exception
 {
     /**
-     * Creates exception
+     * Class constructor
      *
      * @param array|object|string $parentClass  Class that has more than one child class, but it shouldn't. An array
      *                                          of objects, strings, object or string.
      * @param array               $childClasses Child classes
-     * @return TooManyChildClassesException
      */
-    public static function create($parentClass, array $childClasses)
+    public function __construct($parentClass, array $childClasses)
     {
         $template = "The '%s' class requires one child class at most who will extend her, but more than one child"
             . " class was found:\n- %s\n\nWhy did you create more than one classes that extend '%s' class?";
@@ -35,6 +34,6 @@ class TooManyChildClassesException extends Exception
         $parentClassName = Reflection::getClassName($parentClass);
         $message = sprintf($template, $parentClassName, implode("\n- ", $childClasses), $parentClassName);
 
-        return new static($message);
+        parent::__construct($message);
     }
 }

src/Exception/Regex/IncorrectColorHexLengthException.php

@@ -11,24 +11,22 @@ namespace Meritoo\Common\Exception\Regex;
 /**
  * An exception used while length of given hexadecimal value of color is incorrect
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class IncorrectColorHexLengthException extends \Exception
 {
     /**
-     * Creates exception
+     * Class constructor
      *
      * @param string $color Incorrect hexadecimal value of color
-     * @return IncorrectColorHexLengthException
      */
-    public static function create($color)
+    public function __construct($color)
     {
         $template = 'Length of hexadecimal value of color \'%s\' is incorrect. It\'s %d, but it should be 3 or 6.'
             . ' Is there everything ok?';
 
         $message = sprintf($template, $color, strlen($color));
-
-        return new static($message);
+        parent::__construct($message);
     }
 }

src/Exception/Regex/InvalidColorHexValueException.php

@@ -11,21 +11,19 @@ namespace Meritoo\Common\Exception\Regex;
 /**
  * An exception used while given hexadecimal value of color is invalid
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class InvalidColorHexValueException extends \Exception
 {
     /**
-     * Creates exception
+     * Class constructor
      *
      * @param string $color Invalid hexadecimal value of color
-     * @return InvalidColorHexValueException
      */
-    public static function create($color)
+    public function __construct($color)
     {
         $message = sprintf('Hexadecimal value of color \'%s\' is invalid. Is there everything ok?', $color);
-
-        return new static($message);
+        parent::__construct($message);
     }
 }

src/Exception/Regex/InvalidHtmlAttributesException.php

@@ -1,31 +0,0 @@
-<?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\Regex;
-
-/**
- * An exception used while html attributes are invalid
- *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
- */
-class InvalidHtmlAttributesException extends \Exception
-{
-    /**
-     * Creates exception
-     *
-     * @param string $htmlAttributes Invalid html attributes
-     * @return InvalidHtmlAttributesException
-     */
-    public static function create($htmlAttributes)
-    {
-        $message = sprintf('HTML attributes \'%s\' are invalid. Is there everything ok?', $htmlAttributes);
-
-        return new static($message);
-    }
-}

src/Exception/Regex/InvalidUrlException.php

@@ -1,31 +1,23 @@
 <?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\Regex;
 
 /**
  * An exception used while url is invalid
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class InvalidUrlException extends \Exception
 {
     /**
-     * Creates exception
+     * Class constructor
      *
      * @param string $url Invalid url
-     * @return InvalidUrlException
      */
-    public static function create($url)
+    public function __construct($url)
     {
         $message = sprintf('Url \'%s\' is invalid. Is there everything ok?', $url);
-
-        return new static($message);
+        parent::__construct($message);
     }
 }

src/Exception/Type/UnknownDatePartTypeException.php

@@ -1,36 +0,0 @@
-<?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\Type;
-
-use Meritoo\Common\Exception\Base\UnknownTypeException;
-use Meritoo\Common\Type\DatePartType;
-
-/**
- * An exception used while type of date part, e.g. "year", is unknown
- *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
- */
-class UnknownDatePartTypeException extends UnknownTypeException
-{
-    /**
-     * Creates exception
-     *
-     * @param string $unknownDatePart Unknown type of date part
-     * @param string $value           Incorrect value
-     * @return UnknownDatePartTypeException
-     */
-    public static function createException($unknownDatePart, $value)
-    {
-        /* @var UnknownDatePartTypeException $exception */
-        $exception = parent::create($unknownDatePart, new DatePartType(), sprintf('date part (with value %s)', $value));
-
-        return $exception;
-    }
-}

src/Exception/Type/UnknownOopVisibilityTypeException.php

@@ -1,11 +1,5 @@
 <?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\Type;
 
 use Meritoo\Common\Exception\Base\UnknownTypeException;
@@ -14,22 +8,16 @@ use Meritoo\Common\Type\OopVisibilityType;
 /**
  * An exception used while the visibility of a property, a method or (as of PHP 7.1.0) a constant is unknown
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class UnknownOopVisibilityTypeException extends UnknownTypeException
 {
     /**
-     * Creates exception
-     *
-     * @param string $unknownType Unknown visibility of a property, a method or (as of PHP 7.1.0) a constant
-     * @return UnknownOopVisibilityTypeException
+     * {@inheritdoc}
      */
-    public static function createException($unknownType)
+    public function __construct($unknownType)
     {
-        /* @var UnknownOopVisibilityTypeException $exception */
-        $exception = parent::create($unknownType, new OopVisibilityType(), 'OOP-related visibility');
-
-        return $exception;
+        parent::__construct($unknownType, new OopVisibilityType(), 'OOP-related visibility');
     }
 }

src/Exception/ValueObject/InvalidSizeDimensionsException.php

@@ -1,33 +0,0 @@
-<?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/Test/Base/BaseTestCase.php

@@ -14,8 +14,8 @@ use PHPUnit\Framework\TestCase;
 /**
  * Base test case with common methods and data providers
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 abstract class BaseTestCase extends TestCase
 {

src/Test/Base/BaseTypeTestCase.php

@@ -13,8 +13,8 @@ use Meritoo\Common\Traits\Test\Base\BaseTypeTestCaseTrait;
 /**
  * Base test case for the type of something
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 abstract class BaseTypeTestCase extends BaseTestCase
 {

src/Traits/Collection/ArrayAccessTrait.php

@@ -1,67 +0,0 @@
-<?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

@@ -1,26 +0,0 @@
-<?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

@@ -1,28 +0,0 @@
-<?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

@@ -1,215 +0,0 @@
-<?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

@@ -1,28 +0,0 @@
-<?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

@@ -1,110 +0,0 @@
-<?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

@@ -15,13 +15,13 @@ use Meritoo\Common\Type\OopVisibilityType;
 use Meritoo\Common\Utilities\Miscellaneous;
 use ReflectionClass;
 use ReflectionMethod;
-use stdClass;
 
 /**
- * Trait for the base test case
+ * BaseTestCaseTrait
+ * Created on 2017-11-02
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 trait BaseTestCaseTrait
 {
@@ -30,7 +30,7 @@ trait BaseTestCaseTrait
      *
      * @var string
      */
-    private static $testsDataDirPath = 'data/tests';
+    private static $testsDataDirPath = '.data/tests';
 
     /**
      * Provides an empty value
@@ -47,20 +47,6 @@ trait BaseTestCaseTrait
         yield[[]];
     }
 
-    /**
-     * Provides an empty scalar value
-     *
-     * @return Generator
-     */
-    public function provideEmptyScalarValue()
-    {
-        yield[''];
-        yield['   '];
-        yield[null];
-        yield[0];
-        yield[false];
-    }
-
     /**
      * Provides boolean value
      *
@@ -117,29 +103,9 @@ trait BaseTestCaseTrait
         yield['surprise/me/one/more/time.txt'];
     }
 
-    /**
-     * Provides non scalar value, e.g. [] or null
-     *
-     * @return Generator
-     */
-    public function provideNonScalarValue()
-    {
-        yield[
-            [],
-        ];
-
-        yield[
-            null,
-        ];
-
-        yield[
-            new stdClass(),
-        ];
-    }
-
     /**
      * Returns path of file used by tests.
-     * It should be placed in /data/tests directory of this project.
+     * It should be placed in /.data/tests directory of this project.
      *
      * @param string $fileName      Name of file
      * @param string $directoryPath (optional) Path of directory containing the file
@@ -227,6 +193,7 @@ 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 UnknownOopVisibilityTypeException
      */
     protected static function assertConstructorVisibilityAndArguments(
         $classNamespace,
@@ -240,13 +207,7 @@ trait BaseTestCaseTrait
         $reflection = new ReflectionClass($classNamespace);
         $method = $reflection->getConstructor();
 
-        static::assertMethodVisibilityAndArguments(
-            $classNamespace,
-            $method,
-            $visibilityType,
-            $argumentsCount,
-            $requiredArgumentsCount
-        );
+        static::assertMethodVisibilityAndArguments($classNamespace, $method, $visibilityType, $argumentsCount, $requiredArgumentsCount);
     }
 
     /**

src/Traits/Test/Base/BaseTypeTestCaseTrait.php

@@ -14,8 +14,8 @@ use Meritoo\Common\Type\Base\BaseType;
 /**
  * Trait for the base test case for the type of something
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 trait BaseTypeTestCaseTrait
 {

src/Traits/ValueObject/HumanTrait.php

@@ -1,137 +0,0 @@
-<?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

@@ -14,8 +14,8 @@ use Meritoo\Common\Utilities\Reflection;
  * Base / abstract type of something, e.g. type of button, order, date etc.
  * Child class should contain constants - each of them represent one type.
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 abstract class BaseType
 {
@@ -43,7 +43,7 @@ abstract class BaseType
     /**
      * Returns information if given type is correct
      *
-     * @param mixed $type The type to check
+     * @param string $type The type to check
      * @return bool
      */
     public function isCorrectType($type)

src/Type/DatePartType.php

@@ -13,8 +13,8 @@ use Meritoo\Common\Type\Base\BaseType;
 /**
  * Type of date part, e.g. "year"
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class DatePartType extends BaseType
 {

src/Type/OopVisibilityType.php

@@ -7,8 +7,8 @@ use Meritoo\Common\Type\Base\BaseType;
 /**
  * The visibility of a property, a method or (as of PHP 7.1.0) a constant
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  *
  * @see       http://php.net/manual/en/language.oop5.visibility.php
  */

src/Utilities/Bootstrap4CssSelector.php

@@ -1,85 +0,0 @@
-<?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/Bundle.php

@@ -8,23 +8,20 @@
 
 namespace Meritoo\Common\Utilities;
 
-use Meritoo\Common\Exception\Bundle\IncorrectBundleNameException;
-
 /**
  * Useful methods for bundle
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class Bundle
 {
     /**
-     * Returns path of given bundle to view / template with given extension
+     * Returns path to view / template of given bundle
      *
      * @param string $viewPath   Path of the view / template, e.g. "MyDirectory/my-template"
-     * @param string $bundleName Full name of the bundle, e.g. "MyExtraBundle"
-     * @param string $extension  (optional) Extension of the view / template (default: "html.twig")
-     * @throws IncorrectBundleNameException
+     * @param string $bundleName Name of the bundle, e.g. "MyExtraBundle"
+     * @param string $extension  (optional) Extension of the view / template
      * @return string|null
      */
     public static function getBundleViewPath($viewPath, $bundleName, $extension = 'html.twig')
@@ -37,13 +34,6 @@ class Bundle
             return null;
         }
 
-        /*
-         * Given name of bundle is invalid?
-         */
-        if (!Regex::isValidBundleName($bundleName)) {
-            throw IncorrectBundleNameException::create($bundleName);
-        }
-
         /*
          * Path of the view / template doesn't end with given extension?
          */
@@ -51,39 +41,6 @@ class Bundle
             $viewPath = sprintf('%s.%s', $viewPath, $extension);
         }
 
-        /*
-         * Prepare short name of bundle and path of view / template with "/" (instead of ":")
-         */
-        $shortBundleName = static::getShortBundleName($bundleName);
-        $viewPath = str_replace(':', '/', $viewPath);
-
-        return sprintf('@%s/%s', $shortBundleName, $viewPath);
-    }
-
-    /**
-     * Returns short name of bundle (without "Bundle")
-     *
-     * @param string $fullBundleName Full name of the bundle, e.g. "MyExtraBundle"
-     * @throws IncorrectBundleNameException
-     * @return string|null
-     */
-    public static function getShortBundleName($fullBundleName)
-    {
-        /*
-         * Given name of bundle is invalid?
-         */
-        if (!Regex::isValidBundleName($fullBundleName)) {
-            if (!is_string($fullBundleName)) {
-                $fullBundleName = gettype($fullBundleName);
-            }
-
-            throw new IncorrectBundleNameException($fullBundleName);
-        }
-
-        $matches = [];
-        $pattern = Regex::getBundleNamePattern();
-        preg_match($pattern, $fullBundleName, $matches);
-
-        return $matches[1];
+        return sprintf('%s:%s', $bundleName, $viewPath);
     }
 }

src/Utilities/Composer.php

@@ -13,8 +13,8 @@ use stdClass;
 /**
  * Useful Composer-related methods (only static functions)
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class Composer
 {

src/Utilities/CssSelector.php

@@ -1,22 +0,0 @@
-<?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

@@ -10,16 +10,14 @@ namespace Meritoo\Common\Utilities;
 
 use DateInterval;
 use DateTime;
-use Exception;
-use Meritoo\Common\Exception\Type\UnknownDatePartTypeException;
+use Meritoo\Common\Exception\Date\UnknownDatePartTypeException;
 use Meritoo\Common\Type\DatePartType;
-use Meritoo\Common\Type\DatePeriod;
 
 /**
  * Useful date methods
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class Date
 {
@@ -64,118 +62,101 @@ class Date
     const DATE_DIFFERENCE_UNIT_YEARS = 'years';
 
     /**
-     * Returns date's period (that contains start and end date) for given period
+     * Returns start and end date for given period.
+     * The dates are returned in an array with indexes 'start' and 'end'.
      *
      * @param int $period The period, type of period. One of DatePeriod class constants, e.g. DatePeriod::LAST_WEEK.
-     * @throws Exception
-     * @return null|DatePeriod
+     * @return DatePeriod
      */
     public static function getDatesForPeriod($period)
     {
-        /*
-         * Type of period is incorrect?
-         * Nothing to do
-         */
-        if (!(new DatePeriod())->isCorrectType($period)) {
-            return null;
-        }
+        $datePeriod = null;
 
-        $dateStart = null;
-        $dateEnd = null;
+        if (DatePeriod::isCorrectPeriod($period)) {
+            $dateStart = null;
+            $dateEnd = null;
 
-        switch ($period) {
-            case DatePeriod::LAST_WEEK:
-                $thisWeekStart = new DateTime('this week');
+            switch ($period) {
+                case DatePeriod::LAST_WEEK:
+                    $thisWeekStart = new DateTime('this week');
 
-                $dateStart = clone $thisWeekStart;
-                $dateEnd = clone $thisWeekStart;
+                    $dateStart = clone $thisWeekStart;
+                    $dateEnd = clone $thisWeekStart;
 
-                $dateStart->sub(new DateInterval('P7D'));
-                $dateEnd->sub(new DateInterval('P1D'));
+                    $dateStart->sub(new DateInterval('P7D'));
+                    $dateEnd->sub(new DateInterval('P1D'));
 
-                break;
-            case DatePeriod::THIS_WEEK:
-                $dateStart = new DateTime('this week');
+                    break;
+                case DatePeriod::THIS_WEEK:
+                    $dateStart = new DateTime('this week');
 
-                $dateEnd = clone $dateStart;
-                $dateEnd->add(new DateInterval('P6D'));
+                    $dateEnd = clone $dateStart;
+                    $dateEnd->add(new DateInterval('P6D'));
 
-                break;
-            case DatePeriod::NEXT_WEEK:
-                $dateStart = new DateTime('this week');
-                $dateStart->add(new DateInterval('P7D'));
+                    break;
+                case DatePeriod::NEXT_WEEK:
+                    $dateStart = new DateTime('this week');
+                    $dateStart->add(new DateInterval('P7D'));
 
-                $dateEnd = clone $dateStart;
-                $dateEnd->add(new DateInterval('P6D'));
+                    $dateEnd = clone $dateStart;
+                    $dateEnd->add(new DateInterval('P6D'));
 
-                break;
-            case DatePeriod::LAST_MONTH:
-                $dateStart = new DateTime('first day of last month');
-                $dateEnd = new DateTime('last day of last month');
+                    break;
+                case DatePeriod::LAST_MONTH:
+                    $dateStart = new DateTime('first day of last month');
+                    $dateEnd = new DateTime('last day of last month');
 
-                break;
-            case DatePeriod::THIS_MONTH:
-                $lastMonth = self::getDatesForPeriod(DatePeriod::LAST_MONTH);
-                $nextMonth = self::getDatesForPeriod(DatePeriod::NEXT_MONTH);
+                    break;
+                case DatePeriod::THIS_MONTH:
+                    $lastMonth = self::getDatesForPeriod(DatePeriod::LAST_MONTH);
+                    $nextMonth = self::getDatesForPeriod(DatePeriod::NEXT_MONTH);
 
-                if (null !== $lastMonth) {
                     $dateStart = $lastMonth->getEndDate();
                     $dateStart->add(new DateInterval('P1D'));
-                }
 
-                if (null !== $nextMonth) {
                     $dateEnd = $nextMonth->getStartDate();
                     $dateEnd->sub(new DateInterval('P1D'));
-                }
 
-                break;
-            case DatePeriod::NEXT_MONTH:
-                $dateStart = new DateTime('first day of next month');
-                $dateEnd = new DateTime('last day of next month');
+                    break;
+                case DatePeriod::NEXT_MONTH:
+                    $dateStart = new DateTime('first day of next month');
+                    $dateEnd = new DateTime('last day of next month');
 
-                break;
-            case DatePeriod::LAST_YEAR:
-            case DatePeriod::THIS_YEAR:
-            case DatePeriod::NEXT_YEAR:
-                $dateStart = new DateTime();
-                $dateEnd = new DateTime();
+                    break;
+                case DatePeriod::LAST_YEAR:
+                case DatePeriod::THIS_YEAR:
+                case DatePeriod::NEXT_YEAR:
+                    $dateStart = new DateTime();
+                    $dateEnd = new DateTime();
 
-                $yearPeriod = [
-                    DatePeriod::LAST_YEAR,
-                    DatePeriod::NEXT_YEAR,
-                ];
+                    if (DatePeriod::LAST_YEAR == $period || DatePeriod::NEXT_YEAR == $period) {
+                        $yearDifference = 1;
 
-                if (in_array($period, $yearPeriod, true)) {
-                    $yearDifference = 1;
+                        if (DatePeriod::LAST_YEAR == $period) {
+                            $yearDifference *= -1;
+                        }
 
-                    if (DatePeriod::LAST_YEAR === $period) {
-                        $yearDifference *= -1;
+                        $modifyString = sprintf('%s year', $yearDifference);
+                        $dateStart->modify($modifyString);
+                        $dateEnd->modify($modifyString);
                     }
 
-                    $modifyString = sprintf('%s year', $yearDifference);
-                    $dateStart->modify($modifyString);
-                    $dateEnd->modify($modifyString);
-                }
+                    $year = $dateStart->format('Y');
+                    $dateStart->setDate($year, 1, 1);
+                    $dateEnd->setDate($year, 12, 31);
 
-                $year = $dateStart->format('Y');
-                $dateStart->setDate($year, 1, 1);
-                $dateEnd->setDate($year, 12, 31);
+                    break;
+            }
 
-                break;
+            if (null !== $dateStart && null !== $dateEnd) {
+                $dateStart->setTime(0, 0, 0);
+                $dateEnd->setTime(23, 59, 59);
+
+                $datePeriod = new DatePeriod($dateStart, $dateEnd);
+            }
         }
 
-        /*
-         * Start or end date is unknown?
-         * Nothing to do
-         */
-        if (null === $dateStart || null === $dateEnd) {
-            return null;
-        }
-
-        $dateStart->setTime(0, 0);
-        $dateEnd->setTime(23, 59, 59);
-
-        return new DatePeriod($dateStart, $dateEnd);
+        return $datePeriod;
     }
 
     /**
@@ -222,8 +203,7 @@ class Date
 
         return $dateTime
             ->setTime($hour, $minute, $second)
-            ->format($format)
-            ;
+            ->format($format);
     }
 
     /**
@@ -250,8 +230,8 @@ class Date
      * @param int $month The month value
      * @param int $day   The day value
      *
-     * @throws UnknownDatePartTypeException
      * @return int
+     * @throws UnknownDatePartTypeException
      */
     public static function getDayOfWeek($year, $month, $day)
     {
@@ -263,21 +243,21 @@ class Date
          * Oops, incorrect year
          */
         if ($year <= 0) {
-            throw UnknownDatePartTypeException::createException(DatePartType::YEAR, $year);
+            throw new UnknownDatePartTypeException(DatePartType::YEAR, $year);
         }
 
         /*
          * Oops, incorrect month
          */
         if ($month < 1 || $month > 12) {
-            throw UnknownDatePartTypeException::createException(DatePartType::MONTH, $month);
+            throw new UnknownDatePartTypeException(DatePartType::MONTH, $month);
         }
 
         /*
          * Oops, incorrect day
          */
         if ($day < 1 || $day > 31) {
-            throw UnknownDatePartTypeException::createException(DatePartType::DAY, $day);
+            throw new UnknownDatePartTypeException(DatePartType::DAY, $day);
         }
 
         if ($month < 3) {
@@ -355,7 +335,7 @@ class Date
      *
      * @param string|DateTime $dateStart      The start date
      * @param string|DateTime $dateEnd        The end date
-     * @param string          $differenceUnit (optional) Unit of date difference. One of this class
+     * @param int             $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
@@ -376,11 +356,11 @@ class Date
             return null;
         }
 
-        $start = self::getDateTime($dateStart, true);
-        $end = self::getDateTime($dateEnd, true);
+        $dateStart = self::getDateTime($dateStart, true);
+        $dateEnd = self::getDateTime($dateEnd, true);
 
         $difference = [];
-        $dateDiff = $end->getTimestamp() - $start->getTimestamp();
+        $dateDiff = $dateEnd->getTimestamp() - $dateStart->getTimestamp();
 
         $daysInSeconds = 0;
         $hoursInSeconds = 0;
@@ -398,39 +378,39 @@ class Date
             self::DATE_DIFFERENCE_UNIT_MINUTES,
         ];
 
-        if (null === $differenceUnit || self::DATE_DIFFERENCE_UNIT_YEARS === $differenceUnit) {
-            $diff = $end->diff($start);
+        if (null === $differenceUnit || self::DATE_DIFFERENCE_UNIT_YEARS == $differenceUnit) {
+            $diff = $dateEnd->diff($dateStart);
 
             /*
              * 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 = $end->diff($start);
+        if (null === $differenceUnit || self::DATE_DIFFERENCE_UNIT_MONTHS == $differenceUnit) {
+            $diff = $dateEnd->diff($dateStart);
 
             /*
              * 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, true)) {
+        if (null === $differenceUnit || in_array($differenceUnit, $relatedUnits)) {
             $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;
             }
 
@@ -447,13 +427,13 @@ class Date
             $daysInSeconds = $days * $daySeconds;
         }
 
-        if (null === $differenceUnit || in_array($differenceUnit, $relatedUnits, true)) {
+        if (null === $differenceUnit || in_array($differenceUnit, $relatedUnits)) {
             $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;
             }
 
@@ -470,13 +450,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;
             }
 
@@ -495,7 +475,6 @@ class Date
      * @param string   $intervalTemplate (optional) Template used to build date interval. It should contain "%d" as the
      *                                   placeholder which is replaced with a number that represents each iteration.
      *                                   Default: interval for days.
-     * @throws Exception
      * @return array
      */
     public static function getDatesCollection(DateTime $startDate, $datesCount, $intervalTemplate = 'P%dD')
@@ -536,16 +515,11 @@ class Date
     /**
      * Returns random date based on given start date
      *
-     * @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 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 string   $intervalTemplate (optional) Template used to build date interval. The placeholder is replaced
-     *                                   with next, iterated value. If not provided, "P%sD" will be used (default
-     *                                   behaviour).
-     * @throws Exception
+     *                                   with next, iterated value.
      * @return DateTime
      */
     public static function getRandomDate(DateTime $startDate = null, $start = 1, $end = 100, $intervalTemplate = 'P%sD')
@@ -566,7 +540,7 @@ class Date
         }
 
         $randomDate = clone $startDate;
-        $randomInterval = new DateInterval(sprintf($intervalTemplate, mt_rand($start, $end)));
+        $randomInterval = new DateInterval(sprintf($intervalTemplate, rand($start, $end)));
 
         return $randomDate->add($randomInterval);
     }
@@ -578,11 +552,10 @@ 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
-     *                                     (default behaviour).
+     *                                     month", "yyyy"). Otherwise - not and every incorrect value is refused.
      * @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. Default: "Y-m-d".
+     *                                     "2015-01-01 10:00" value.
      * @return DateTime|bool
      */
     public static function getDateTime($value, $allowCompoundFormats = false, $dateFormat = 'Y-m-d')
@@ -650,7 +623,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, true)) {
+                        if (in_array($value, $specialFormats)) {
                             return false;
                         }
                     }
@@ -675,7 +648,7 @@ class Date
              */
             $dateString = (new DateTime())->format($value);
 
-            if ($dateString !== (string)$value) {
+            if ($dateString != $value) {
                 return new DateTime($dateString);
             }
         } catch (\Exception $exception) {
@@ -719,7 +692,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/DatePeriod.php

@@ -6,20 +6,18 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Common\Type;
+namespace Meritoo\Common\Utilities;
 
 use DateTime;
-use Meritoo\Common\Type\Base\BaseType;
-use Meritoo\Common\Utilities\Date;
 
 /**
  * A date's period.
  * Contains start and end date of the period.
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
-class DatePeriod extends BaseType
+class DatePeriod
 {
     /**
      * The period constant: last month
@@ -110,6 +108,17 @@ class DatePeriod extends BaseType
         $this->endDate = $endDate;
     }
 
+    /**
+     * Returns information if given period is correct
+     *
+     * @param int $period The period to verify
+     * @return bool
+     */
+    public static function isCorrectPeriod($period)
+    {
+        return in_array($period, Reflection::getConstants(__CLASS__));
+    }
+
     /**
      * Returns formatted one of the period's date: start date or end date
      *

src/Utilities/GeneratorUtility.php

@@ -13,8 +13,8 @@ use Generator;
 /**
  * Useful methods for the Generator class (only static functions)
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class GeneratorUtility
 {

src/Utilities/Locale.php

@@ -11,8 +11,8 @@ namespace Meritoo\Common\Utilities;
 /**
  * Useful locale methods
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class Locale
 {
@@ -23,7 +23,7 @@ class 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  (optional) Country code, in ISO 3166-1 alpha-2 format, e.g. "FR"
-     * @return false|string
+     * @return bool
      *
      * Available categories (values of $category argument):
      * - LC_ALL for all of the below
@@ -52,34 +52,14 @@ class Locale
             LC_MESSAGES,
         ];
 
-        if (empty($languageCode) || !in_array($category, $availableCategories, true)) {
+        if (empty($languageCode) || !in_array($category, $availableCategories)) {
             return false;
         }
 
         $localeLongForm = self::getLongForm($languageCode, $countryCode);
+        setlocale($category, $localeLongForm);
 
-        return setlocale($category, $localeLongForm);
-    }
-
-    /**
-     * Returns locale for given category
-     *
-     * @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.
-     * @return string
-     *
-     * Available categories (values of $category argument):
-     * - LC_ALL for all of the below
-     * - LC_COLLATE for string comparison, see strcoll()
-     * - LC_CTYPE for character classification and conversion, for example strtoupper()
-     * - LC_MONETARY for localeconv()
-     * - LC_NUMERIC for decimal separator (See also localeconv())
-     * - LC_TIME for date and time formatting with strftime()
-     * - LC_MESSAGES for system responses (available if PHP was compiled with libintl)
-     */
-    public static function getLocale($category)
-    {
-        return setlocale($category, '0');
+        return true;
     }
 
     /**

src/Utilities/MimeTypes.php

@@ -11,8 +11,8 @@ namespace Meritoo\Common\Utilities;
 /**
  * Useful methods for mime types of files
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class MimeTypes
 {
@@ -733,7 +733,7 @@ class MimeTypes
      */
     public static function getExtension($mimeType)
     {
-        if (is_string($mimeType) && in_array($mimeType, self::$mimeTypes, true)) {
+        if (is_string($mimeType) && in_array($mimeType, self::$mimeTypes)) {
             $data = Arrays::setKeysAsValues(self::$mimeTypes, false);
 
             return $data[$mimeType];
@@ -759,8 +759,9 @@ class MimeTypes
      * Returns mime type of given file
      *
      * @param string $filePath Path of the file to check
-     * @throws \RuntimeException
      * @return string
+     *
+     * @throws \RuntimeException
      */
     public static function getMimeType($filePath)
     {
@@ -806,7 +807,7 @@ class MimeTypes
      */
     public static function isImage($mimeType)
     {
-        if (in_array($mimeType, self::$mimeTypes, true)) {
+        if (in_array($mimeType, self::$mimeTypes)) {
             return (bool)preg_match('|^image/.+$|', $mimeType);
         }
 

src/Utilities/Miscellaneous.php

@@ -9,13 +9,14 @@
 namespace Meritoo\Common\Utilities;
 
 use Gedmo\Sluggable\Util\Urlizer;
+use Symfony\Component\HttpFoundation\Cookie;
 use Transliterator;
 
 /**
  * Miscellaneous methods (only static functions)
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class Miscellaneous
 {
@@ -60,15 +61,15 @@ class Miscellaneous
             $startFileName = mb_substr($startFileName, 1);
         }
 
-        $directoryContent = scandir($directoryPath, SCANDIR_SORT_ASCENDING);
+        $directoryContent = scandir($directoryPath);
 
         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;
                         }
 
@@ -82,18 +83,18 @@ class Miscellaneous
                     if (null !== $content) {
                         $files[$fileName] = $content;
 
-                        if (null !== $maxFilesCount) {
+                        if (!empty($maxFilesCount)) {
                             $count += Arrays::getNonArrayElementsCount($content);
                         }
                     } else {
                         $files[] = $fileName;
 
-                        if (null !== $maxFilesCount) {
+                        if (!empty($maxFilesCount)) {
                             ++$count;
                         }
                     }
 
-                    if (null !== $maxFilesCount && $count >= $maxFilesCount) {
+                    if (!empty($maxFilesCount) && $count >= $maxFilesCount) {
                         break;
                     }
                 }
@@ -158,17 +159,11 @@ class Miscellaneous
      */
     public static function includeFileExtension($fileName, $extension)
     {
-        $fileExtension = self::getFileExtension($fileName, true);
-
-        /*
-         * File has given extension?
-         * Nothing to do
-         */
-        if ($fileExtension === strtolower($extension)) {
-            return $fileName;
+        if (self::getFileExtension($fileName, true) != strtolower($extension)) {
+            return sprintf('%s.%s', $fileName, $extension);
         }
 
-        return sprintf('%s.%s', $fileName, $extension);
+        return $fileName;
     }
 
     /**
@@ -233,28 +228,31 @@ 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.%s'; // [file's name]-[unique key].[file's extension]
+        $template = '%s-%s'; // file's name and unique key
+
+        if ($objectId > 0) {
+            $template .= '-%s'; // object ID
+        }
+
+        $template .= '.%s'; // file's extension
 
         /*
          * Add some uniqueness
          */
-        $unique = self::getUniqueString(mt_rand());
+        $unique = uniqid(mt_rand(), true);
 
         /*
          * 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);
         }
 
@@ -296,6 +294,34 @@ 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
      *
@@ -306,7 +332,7 @@ class Miscellaneous
     {
         $phpModulesArray = get_loaded_extensions();
 
-        return in_array($phpModuleName, $phpModulesArray, false);
+        return in_array($phpModuleName, $phpModulesArray);
     }
 
     /**
@@ -425,14 +451,6 @@ 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);
@@ -442,7 +460,7 @@ class Miscellaneous
          * Value to find is neither a string nor an array OR it's an empty string?
          * Nothing to do
          */
-        if ((!$searchIsString && !$searchIsArray) || ($searchIsString && '' === $search)) {
+        if ((!$searchIsString && !$searchIsArray) || ($searchIsString && 0 == strlen($search))) {
             return $effect;
         }
 
@@ -452,50 +470,40 @@ class Miscellaneous
         $bothAreStrings = $searchIsString && $replacementIsString;
         $bothAreArrays = $searchIsArray && $replacementIsArray;
 
-        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
+         * First step: replace strings, simple operation with strings
          */
-        if ($bothAreStrings) {
+        if ($searchIsString && $replacementIsString) {
+            if ($quoteStrings) {
+                $replacement = '\'' . $replacement . '\'';
+            }
+
             $effect = str_replace($search, $replacement, $subject);
         }
 
         /*
-         * 2nd step: replace with regular expressions.
+         * Second step: replace with regular expressions.
          * Attention. Searched and replacement value should be the same type: strings or arrays.
          */
-        if ($effect === $subject && ($bothAreStrings || $bothAreArrays)) {
+        if ($effect == $subject && ($bothAreStrings || $bothAreArrays)) {
+            if ($quoteStrings && $replacementIsString) {
+                $replacement = '\'' . $replacement . '\'';
+            }
+
             /*
              * 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)))) {
-                $replaced = @preg_replace($search, $replacement, $subject);
-
-                if (null !== $replaced && [] !== $replaced) {
-                    $effect = $replaced;
-                }
+                $effect = preg_replace($search, $replacement, $subject);
             }
         }
 
         /*
-         * 3rd step: complex replace of the replacement defined as an array.
+         * Third 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 = '';
 
@@ -518,6 +526,16 @@ 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;
 
@@ -570,12 +588,7 @@ class Miscellaneous
      */
     public static function getOperatingSystemNameServer()
     {
-        return PHP_OS;
-
-        /*
-         * Previous version:
-         * return php_uname('s');
-         */
+        return php_uname('s');
     }
 
     /**
@@ -613,10 +626,10 @@ class Miscellaneous
      * Breaks long text
      *
      * @param string $text                   The text to check and break
-     * @param int    $perLine                (optional) Characters count per line. Default: 100.
-     * @param string $separator              (optional) Separator that is placed between lines. Default: "<br>".
-     * @param string $encoding               (optional) Character encoding. Used by mb_substr(). Default: "UTF-8".
-     * @param int    $proportionalAberration (optional) Proportional aberration for chars (percent value). Default: 20.
+     * @param int    $perLine                (optional) Characters count per line
+     * @param string $separator              (optional) Separator that is placed beetwen lines
+     * @param string $encoding               (optional) Character encoding. Used by mb_substr().
+     * @param int    $proportionalAberration (optional) Proportional aberration for chars (percent value)
      * @return string
      */
     public static function breakLongText(
@@ -667,8 +680,7 @@ class Miscellaneous
 
                     $spacePosition = mb_strrpos($lineWithAberration, ' ', 0, $encoding);
 
-                    if (false !== $spacePosition && 0 < $spacePosition) {
-                        /* @var int $spacePosition */
+                    if ($spacePosition > 0) {
                         $perLine = $spacePosition;
                         $insertSeparator = true;
                     }
@@ -704,29 +716,21 @@ class Miscellaneous
      *
      * @param string $directoryPath Directory path
      * @param bool   $contentOnly   (optional) If is set to true, only content of the directory is removed, not
-     *                              directory itself. Otherwise - directory is removed too (default behaviour).
-     * @return bool|null
+     *                              directory. Otherwise - directory is removed too.
+     * @return bool
      */
     public static function removeDirectory($directoryPath, $contentOnly = false)
     {
-        /*
-         * Directory does not exist?
-         * Nothing to do
-         */
         if (!file_exists($directoryPath)) {
-            return null;
+            return true;
         }
 
-        /*
-         * It's not a directory?
-         * Let's treat it like file
-         */
         if (!is_dir($directoryPath)) {
             return unlink($directoryPath);
         }
 
-        foreach (scandir($directoryPath, SCANDIR_SORT_ASCENDING) as $item) {
-            if ('.' === $item || '..' === $item) {
+        foreach (scandir($directoryPath) as $item) {
+            if ('.' == $item || '..' == $item) {
                 continue;
             }
 
@@ -735,9 +739,6 @@ class Miscellaneous
             }
         }
 
-        /*
-         * Directory should be removed too?
-         */
         if (!$contentOnly) {
             return rmdir($directoryPath);
         }
@@ -775,7 +776,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);
@@ -796,6 +797,10 @@ 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)
     {
@@ -811,7 +816,16 @@ class Miscellaneous
             $effect = mb_strtoupper($effect);
         }
 
-        return lcfirst($effect);
+        if (function_exists('lcfirst')) {
+            $effect = lcfirst($effect);
+        } else {
+            $first = mb_strtolower($effect[0]);
+            $rest = mb_substr($effect, 1);
+
+            $effect = $first . $rest;
+        }
+
+        return $effect;
     }
 
     /**
@@ -840,7 +854,16 @@ class Miscellaneous
             $effect = mb_strtoupper($effect);
         }
 
-        return ucfirst($effect);
+        if (function_exists('ucfirst')) {
+            $effect = ucfirst($effect);
+        } else {
+            $first = mb_strtoupper($effect[0]);
+            $rest = mb_substr($effect, 1);
+
+            $effect = $first . $rest;
+        }
+
+        return $effect;
     }
 
     /**
@@ -881,9 +904,9 @@ class Miscellaneous
             'TB',
             'PB',
         ];
-
         $index = floor(log($sizeInBytes, 1024));
-        $size = round($sizeInBytes / (1024 ** $index), 2);
+
+        $size = round($sizeInBytes / pow(1024, $index), 2);
         $unit = $units[(int)$index];
 
         return sprintf('%s %s', $size, $unit);
@@ -1159,12 +1182,148 @@ class Miscellaneous
 
             if (null !== $globalSource && isset($globalSource[$variableName])) {
                 $value = $globalSource[$variableName];
+
+                if (!ini_get('magic_quotes_gpc')) {
+                    $value = addslashes($value);
+                }
             }
         }
 
         return $value;
     }
 
+    /**
+     * Returns a CURL response with parsed HTTP headers as array with "headers", "cookies" and "content" keys
+     *
+     * The headers and cookies are parsed and returned as an array, and an array of Cookie objects. Returned array looks
+     * like this example:
+     * <code>
+     * [
+     *      'headers' => [
+     *          'Content-Type' => 'text/html; charset=UTF-8',
+     *          ...
+     *      ],
+     *      'cookies' => [
+     *          new Symfony\Component\HttpFoundation\Cookie(),
+     *          new Symfony\Component\HttpFoundation\Cookie(),
+     *          ...
+     *      ],
+     *      'content' => '<html>...</html>'
+     * ]
+     * </code>
+     *
+     * If you want to attach HTTP headers into response content by CURL you need to set "CURLOPT_HEADER" option
+     * to "true". To read exact length of HTTP headers from CURL you can use "curl_getinfo()" function
+     * and read "CURLINFO_HEADER_SIZE" option.
+     *
+     * @param string $response   the full content of response, including HTTP headers
+     * @param int    $headerSize The length of HTTP headers in content
+     * @return array
+     */
+    public static function getCurlResponseWithHeaders($response, $headerSize)
+    {
+        $headerContent = mb_substr($response, 0, $headerSize);
+        $content = mb_substr($response, $headerSize);
+        $headers = [];
+        $cookies = [];
+
+        /*
+         * Let's transform headers content into two arrays: headers and cookies
+         */
+        foreach (explode("\r\n", $headerContent) as $i => $line) {
+            /*
+             * First line is only HTTP status and is unneeded so skip it
+             */
+            if (0 === $i) {
+                continue;
+            }
+
+            if (Regex::contains($line, ':')) {
+                list($key, $value) = explode(': ', $line);
+
+                /*
+                 * If the header is a "set-cookie" let's save it to "cookies" array
+                 */
+                if ('Set-Cookie' === $key) {
+                    $cookieParameters = explode(';', $value);
+
+                    $name = '';
+                    $value = '';
+                    $expire = 0;
+                    $path = '/';
+                    $domain = null;
+                    $secure = false;
+                    $httpOnly = true;
+
+                    foreach ($cookieParameters as $j => $parameter) {
+                        $param = explode('=', $parameter);
+
+                        /*
+                         * First parameter will be always a cookie name and it's value. It is not needed to run
+                         * further actions for them, so save the values and move to next parameter.
+                         */
+                        if (0 === $j) {
+                            $name = trim($param[0]);
+                            $value = trim($param[1]);
+                            continue;
+                        }
+
+                        /*
+                         * Now there would be the rest of cookie parameters, names of params are sent different way so
+                         * I need to lowercase the names and remove unneeded spaces.
+                         */
+                        $paramName = mb_strtolower(trim($param[0]));
+                        $paramValue = true;
+
+                        /*
+                         * Some parameters don't have value e.g. "secure", but the value for them if they're specified
+                         * is "true". Otherwise - just read a value for parameter if exists.
+                         */
+                        if (array_key_exists(1, $param)) {
+                            $paramValue = trim($param[1]);
+                        }
+
+                        switch ($paramName) {
+                            case 'expires':
+                                $expire = $paramValue;
+                                break;
+                            case 'path':
+                                $path = $paramValue;
+                                break;
+                            case 'domain':
+                                $domain = $paramValue;
+                                break;
+                            case 'secure':
+                                $secure = $paramValue;
+                                break;
+                            case 'httponly':
+                                $httpOnly = $paramValue;
+                                break;
+                        }
+                    }
+
+                    /*
+                     * Create new Cookie object and add it to "cookies" array.
+                     * I must skip to next header as cookies shouldn't be saved in "headers" array.
+                     */
+                    $cookies[] = new Cookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
+                    continue;
+                }
+
+                /*
+                 * Save response header which is not a cookie
+                 */
+                $headers[$key] = $value;
+            }
+        }
+
+        return [
+            'headers' => $headers,
+            'cookies' => $cookies,
+            'content' => $content,
+        ];
+    }
+
     /**
      * Adds missing the "0" characters to given number until given length is reached
      *
@@ -1204,7 +1363,7 @@ class Miscellaneous
                 continue;
             }
 
-            $text .= '0';
+            $text = $text . '0';
         }
 
         return $text;
@@ -1259,8 +1418,8 @@ class Miscellaneous
         if ($asHexadecimal) {
             $hexadecimal = dechex($colorComponent);
 
-            if (1 === strlen($hexadecimal)) {
-                return sprintf('0%s', $hexadecimal);
+            if (1 == strlen($hexadecimal)) {
+                return sprintf('0%s', $hexadecimal, $hexadecimal);
             }
 
             return $hexadecimal;
@@ -1287,14 +1446,14 @@ class Miscellaneous
          * Verify and get valid value of color.
          * An exception will be thrown if the value is not a color.
          */
-        $validColor = Regex::getValidColorHexValue($color);
+        $color = Regex::getValidColorHexValue($color);
 
         /*
          * Grab color's components
          */
-        $red = hexdec(substr($validColor, 0, 2));
-        $green = hexdec(substr($validColor, 2, 2));
-        $blue = hexdec(substr($validColor, 4, 2));
+        $red = hexdec(substr($color, 0, 2));
+        $green = hexdec(substr($color, 2, 2));
+        $blue = hexdec(substr($color, 4, 2));
 
         /*
          * Calculate inverted color's components

src/Utilities/QueryBuilderUtility.php

@@ -17,8 +17,8 @@ use Doctrine\ORM\QueryBuilder;
 /**
  * Useful methods for query builder (the Doctrine's QueryBuilder class)
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class QueryBuilderUtility
 {
@@ -33,10 +33,6 @@ class QueryBuilderUtility
     {
         $aliases = $queryBuilder->getRootAliases();
 
-        /*
-         * No aliases?
-         * Nothing to do
-         */
         if (empty($aliases)) {
             return null;
         }
@@ -46,8 +42,7 @@ class QueryBuilderUtility
 
     /**
      * Returns alias of given property joined in given query builder
-     *
-     * If there are no joins or the join does not exist, null is returned.
+     * If the join does not exist, null is returned.
      * It's also information if given property is already joined in given query builder.
      *
      * @param QueryBuilder $queryBuilder The query builder to verify
@@ -58,10 +53,6 @@ class QueryBuilderUtility
     {
         $joins = $queryBuilder->getDQLPart('join');
 
-        /*
-         * No joins?
-         * Nothing to do
-         */
         if (empty($joins)) {
             return null;
         }
@@ -90,7 +81,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|null  $alias        (optional) Alias used in the query
+     * @param string       $alias        (optional) Alias used in the query
      * @return QueryBuilder
      *
      * Example of the $criteria argument:
@@ -106,45 +97,35 @@ class QueryBuilderUtility
      *      'position' => 5,
      * ]
      */
-    public static function setCriteria(QueryBuilder $queryBuilder, array $criteria = [], $alias = null)
+    public static function setCriteria(QueryBuilder $queryBuilder, array $criteria = [], $alias = '')
     {
-        /*
-         * No criteria used in WHERE clause?
-         * Nothing to do
-         */
-        if (empty($criteria)) {
-            return $queryBuilder;
-        }
+        if (!empty($criteria)) {
+            if (empty($alias)) {
+                $alias = self::getRootAlias($queryBuilder);
+            }
 
-        /*
-         * No alias provided?
-         * Let's use root alias
-         */
-        if (null === $alias || '' === $alias) {
-            $alias = self::getRootAlias($queryBuilder);
-        }
+            foreach ($criteria as $column => $value) {
+                $compareOperator = '=';
 
-        foreach ($criteria as $column => $value) {
-            $compareOperator = '=';
+                if (is_array($value) && !empty($value)) {
+                    if (2 == count($value)) {
+                        $compareOperator = $value[1];
+                    }
 
-            if (is_array($value) && !empty($value)) {
-                if (2 === count($value)) {
-                    $compareOperator = $value[1];
+                    $value = $value[0];
                 }
 
-                $value = $value[0];
+                $predicate = sprintf('%s.%s %s :%s', $alias, $column, $compareOperator, $column);
+
+                if (null === $value) {
+                    $predicate = $queryBuilder->expr()->isNull(sprintf('%s.%s', $alias, $column));
+                    unset($criteria[$column]);
+                } else {
+                    $queryBuilder->setParameter($column, $value);
+                }
+
+                $queryBuilder = $queryBuilder->andWhere($predicate);
             }
-
-            $predicate = sprintf('%s.%s %s :%s', $alias, $column, $compareOperator, $column);
-
-            if (null === $value) {
-                $predicate = $queryBuilder->expr()->isNull(sprintf('%s.%s', $alias, $column));
-                unset($criteria[$column]);
-            } else {
-                $queryBuilder->setParameter($column, $value);
-            }
-
-            $queryBuilder = $queryBuilder->andWhere($predicate);
         }
 
         return $queryBuilder;
@@ -155,14 +136,14 @@ class QueryBuilderUtility
      *
      * @param EntityManager         $entityManager The entity manager
      * @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.
+     * @param bool                  $flushDeleted  (optional) If is set to true, flushes the deleted objects.
+     *                                             Otherwise - not.
      * @return bool
      */
     public static function deleteEntities(EntityManager $entityManager, $entities, $flushDeleted = true)
     {
         /*
-         * No entities provided?
+         * No entities found?
          * Nothing to do
          */
         if (empty($entities)) {
@@ -188,30 +169,24 @@ class QueryBuilderUtility
      * Attention. Existing parameters will be overridden.
      *
      * @param QueryBuilder          $queryBuilder The query builder
-     * @param array|ArrayCollection $parameters   Parameters to add. Collection of Doctrine\ORM\Query\Parameter
-     *                                            instances or an array with key-value pairs.
+     * @param array|ArrayCollection $parameters   Parameters to add. Collection of instances of
+     *                                            Doctrine\ORM\Query\Parameter class or an array with key-value pairs.
      * @return QueryBuilder
      */
     public static function addParameters(QueryBuilder $queryBuilder, $parameters)
     {
-        /*
-         * No parameters?
-         * Nothing to do
-         */
-        if (empty($parameters)) {
-            return $queryBuilder;
-        }
+        if (!empty($parameters)) {
+            foreach ($parameters as $key => $parameter) {
+                $name = $key;
+                $value = $parameter;
 
-        foreach ($parameters as $key => $parameter) {
-            $name = $key;
-            $value = $parameter;
+                if ($parameter instanceof Parameter) {
+                    $name = $parameter->getName();
+                    $value = $parameter->getValue();
+                }
 
-            if ($parameter instanceof Parameter) {
-                $name = $parameter->getName();
-                $value = $parameter->getValue();
+                $queryBuilder->setParameter($name, $value);
             }
-
-            $queryBuilder->setParameter($name, $value);
         }
 
         return $queryBuilder;

src/Utilities/Reflection.php

@@ -13,14 +13,18 @@ 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
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class Reflection
 {
@@ -36,14 +40,14 @@ class Reflection
     {
         $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;
                     }
@@ -64,14 +68,14 @@ class Reflection
      */
     public static function getConstants($class)
     {
-        $reflection = new \ReflectionClass($class);
+        $reflection = new ReflectionClass($class);
 
         return $reflection->getConstants();
     }
 
     /**
-     * Returns maximum integer value of constant of given class / object.
-     * Constants whose values are integers are considered only.
+     * Returns maximum constant from all constants of given class / object.
+     * Values of constants should be integers.
      *
      * @param object|string $class The object or name of object's class
      * @return int|null
@@ -104,7 +108,7 @@ class Reflection
      */
     public static function hasMethod($class, $method)
     {
-        $reflection = new \ReflectionClass($class);
+        $reflection = new ReflectionClass($class);
 
         return $reflection->hasMethod($method);
     }
@@ -118,7 +122,7 @@ class Reflection
      */
     public static function hasProperty($class, $property)
     {
-        $reflection = new \ReflectionClass($class);
+        $reflection = new ReflectionClass($class);
 
         return $reflection->hasProperty($property);
     }
@@ -132,7 +136,7 @@ class Reflection
      */
     public static function hasConstant($class, $constant)
     {
-        $reflection = new \ReflectionClass($class);
+        $reflection = new ReflectionClass($class);
 
         return $reflection->hasConstant($constant);
     }
@@ -146,7 +150,7 @@ class Reflection
      */
     public static function getConstantValue($class, $constant)
     {
-        $reflection = new \ReflectionClass($class);
+        $reflection = new ReflectionClass($class);
 
         if (self::hasConstant($class, $constant)) {
             return $reflection->getConstant($constant);
@@ -185,16 +189,16 @@ 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')
              *
              * while using "project.name" as property - $project has $name property ($project exists in the Deal class)
              * and the $project equals null
              *
-             * Meritoo <github@meritoo.pl>
+             * Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
              * 2016-11-07
              */
             if (null !== $object) {
@@ -212,17 +216,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 ($force || $class->hasProperty($property)) {
+                if ($class->hasProperty($property) || $force) {
                     $property = Inflector::classify($property);
 
                     $getterPrefixes = [
@@ -235,7 +239,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?
@@ -382,13 +386,13 @@ class Reflection
     {
         $fullClassName = self::getClassName($source);
 
-        if (null === $fullClassName || '' === $fullClassName) {
+        if (empty($fullClassName)) {
             return '';
         }
 
         $className = self::getClassName($source, true);
 
-        if ($className === $fullClassName) {
+        if ($className == $fullClassName) {
             return $className;
         }
 
@@ -407,7 +411,7 @@ class Reflection
         $className = self::getClassName($source);
         $interfaces = class_implements($className);
 
-        return in_array($interface, $interfaces, true);
+        return in_array($interface, $interfaces);
     }
 
     /**
@@ -424,8 +428,8 @@ class Reflection
 
         $parents = class_parents($childClassName);
 
-        if (is_array($parents) && 0 < count($parents)) {
-            return in_array($parentClassName, $parents, true);
+        if (is_array($parents)) {
+            return in_array($parentClassName, $parents);
         }
 
         return false;
@@ -435,22 +439,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.
-     * @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);
@@ -472,12 +476,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
-     * @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();
     }
@@ -488,8 +492,8 @@ class Reflection
      *
      * @param array|object|string $class Class who child classes should be returned. An array of objects, strings,
      *                                   object or string.
-     * @throws CannotResolveClassNameException
      * @return array|null
+     * @throws CannotResolveClassNameException
      */
     public static function getChildClasses($class)
     {
@@ -509,7 +513,7 @@ class Reflection
          * Oops, cannot resolve class
          */
         if (null === $className) {
-            throw CannotResolveClassNameException::create($class);
+            throw new CannotResolveClassNameException($class);
         }
 
         $childClasses = [];
@@ -526,7 +530,7 @@ class Reflection
                  */
                 $realClass = ClassUtils::getRealClass($oneClass);
 
-                if (in_array($realClass, $childClasses, true)) {
+                if (in_array($realClass, $childClasses)) {
                     continue;
                 }
 
@@ -543,9 +547,10 @@ class Reflection
      *
      * @param array|object|string $parentClass Class who child class should be returned. An array of objects,
      *                                         namespaces, object or namespace.
+     * @return mixed
+     *
      * @throws MissingChildClassesException
      * @throws TooManyChildClassesException
-     * @return mixed
      */
     public static function getOneChildClass($parentClass)
     {
@@ -556,7 +561,7 @@ class Reflection
          * Oops, the base / parent class hasn't child class
          */
         if (empty($childClasses)) {
-            throw MissingChildClassesException::create($parentClass);
+            throw new MissingChildClassesException($parentClass);
         }
 
         /*
@@ -564,20 +569,20 @@ class Reflection
          * Oops, the base / parent class has too many child classes
          */
         if (count($childClasses) > 1) {
-            throw TooManyChildClassesException::create($parentClass, $childClasses);
+            throw new TooManyChildClassesException($parentClass, $childClasses);
         }
 
         return trim($childClasses[0]);
     }
 
     /**
-     * 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.
-     * @return null|\ReflectionProperty
+     * @return null|ReflectionProperty
      */
     public static function getProperty($class, $property, $filter = null)
     {
@@ -585,9 +590,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;
                 }
             }
@@ -603,8 +608,8 @@ class Reflection
      * @param array|string        $trait         An array of strings or string
      * @param bool                $verifyParents If is set to true, parent classes are verified if they use given
      *                                           trait. Otherwise - not.
-     * @throws CannotResolveClassNameException
      * @return bool|null
+     * @throws CannotResolveClassNameException
      */
     public static function usesTrait($class, $trait, $verifyParents = false)
     {
@@ -614,21 +619,21 @@ class Reflection
         /*
          * Oops, cannot resolve class
          */
-        if (null === $className || '' === $className) {
-            throw CannotResolveClassNameException::create($class);
+        if (empty($className)) {
+            throw new CannotResolveClassNameException($class);
         }
 
         /*
          * Oops, cannot resolve trait
          */
-        if (null === $traitName || '' === $traitName) {
+        if (empty($traitName)) {
             throw new CannotResolveClassNameException($class, false);
         }
 
-        $reflection = new \ReflectionClass($className);
+        $reflection = new ReflectionClass($className);
         $traitsNames = $reflection->getTraitNames();
 
-        $uses = in_array($traitName, $traitsNames, true);
+        $uses = in_array($traitName, $traitsNames);
 
         if (!$uses && $verifyParents) {
             $parentClassName = self::getParentClassName($className);
@@ -651,7 +656,7 @@ class Reflection
     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) {
@@ -660,57 +665,4 @@ 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,10 +12,10 @@ use Meritoo\Common\Exception\Regex\IncorrectColorHexLengthException;
 use Meritoo\Common\Exception\Regex\InvalidColorHexValueException;
 
 /**
- * Useful methods related to regular expressions
+ * Useful regular expressions methods
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class Regex
 {
@@ -25,33 +25,18 @@ class Regex
      * @var array
      */
     private static $patterns = [
-        'email'            => '/^[\w-.]{2,}@[\w-]+\.[\w]{2,}+$/',
+        'email'            => '/[\w-]{2,}@[\w-]+\.[\w]{2,}+/',
         'phone'            => '/^\+?[0-9 ]+$/',
         'camelCasePart'    => '/([a-z]|[A-Z]){1}[a-z]*/',
         'urlProtocol'      => '/^([a-z]+:\/\/)',
         'urlDomain'        => '([\da-z\.-]+)\.([a-z\.]{2,6})(\/)?([\w\.\-]*)?(\?)?([\w \.\-\/=&]*)\/?$/i',
         'letterOrDigit'    => '/[a-zA-Z0-9]+/',
         'htmlEntity'       => '/&[a-z0-9]+;/',
-        'htmlAttribute'    => '/([\w-]+)="([\w -]+)"/',
         'fileName'         => '/.+\.\w+$/',
         'isQuoted'         => '/^[\'"]{1}.+[\'"]{1}$/',
         'windowsBasedPath' => '/^[A-Z]{1}:\\\.*$/',
         'money'            => '/^[-+]?\d+([\.,]{1}\d*)?$/',
         '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+)[\ ]*$/',
     ];
 
     /**
@@ -71,77 +56,46 @@ class Regex
      */
     public static function isValidEmail($email)
     {
-        /*
-         * Not a string?
-         * Nothing to do
-         */
-        if (!is_string($email)) {
-            return false;
-        }
-
         $pattern = self::getEmailPattern();
 
         return (bool)preg_match($pattern, $email);
     }
 
     /**
-     * Returns information if given tax ID is valid (in Poland it's named "NIP")
+     * Returns information if given tax ID (in polish: NIP) is valid
      *
-     * @param string $taxIdString Tax ID (NIP) string
+     * @param string $taxidString Tax ID (NIP) string
      * @return bool
      */
-    public static function isValidTaxId($taxIdString)
+    public static function isValidTaxid($taxidString)
     {
-        /*
-         * Not a string?
-         * Nothing to do
-         */
-        if (!is_string($taxIdString)) {
-            return false;
+        if (!empty($taxidString)) {
+            $weights = [
+                6,
+                5,
+                7,
+                2,
+                3,
+                4,
+                5,
+                6,
+                7,
+            ];
+            $taxid = preg_replace('/[\s-]/', '', $taxidString);
+            $sum = 0;
+
+            if (10 == strlen($taxid) && is_numeric($taxid)) {
+                for ($x = 0; $x <= 8; ++$x) {
+                    $sum += $taxid[$x] * $weights[$x];
+                }
+
+                if ((($sum % 11) % 10) == $taxid[9]) {
+                    return true;
+                }
+            }
         }
 
-        /*
-         * Empty/Unknown value?
-         * Nothing to do
-         */
-        if (empty($taxIdString)) {
-            return false;
-        }
-
-        $taxId = preg_replace('/[\s-]/', '', $taxIdString);
-
-        /*
-         * Tax ID is not 10 characters length OR is not numeric?
-         * Nothing to do
-         */
-        if (!is_numeric($taxId) || 10 !== strlen($taxId)) {
-            return false;
-        }
-
-        $weights = [
-            6,
-            5,
-            7,
-            2,
-            3,
-            4,
-            5,
-            6,
-            7,
-        ];
-
-        $sum = 0;
-
-        for ($x = 0; $x <= 8; ++$x) {
-            $sum += $taxId[$x] * $weights[$x];
-        }
-
-        /*
-         * Last number it's a remainder from dividing per 11?
-         * Tax ID is valid
-         */
-
-        return $sum % 11 === (int)$taxId[9];
+        return false;
     }
 
     /**
@@ -154,14 +108,6 @@ class Regex
      */
     public static function isValidUrl($url, $requireProtocol = false)
     {
-        /*
-         * Not a string?
-         * Nothing to do
-         */
-        if (!is_string($url)) {
-            return false;
-        }
-
         $pattern = self::getUrlPattern($requireProtocol);
 
         return (bool)preg_match($pattern, $url);
@@ -175,108 +121,88 @@ class Regex
      */
     public static function isValidPhoneNumber($phoneNumber)
     {
-        /*
-         * Not a string?
-         * Nothing to do
-         */
-        if (!is_string($phoneNumber)) {
-            return false;
-        }
-
         $pattern = self::getPhoneNumberPattern();
 
-        return (bool)preg_match($pattern, trim($phoneNumber));
+        return (bool)preg_match($pattern, $phoneNumber);
     }
 
     /**
-     * Returns array values that match given pattern (or values that keys match the pattern)
+     * Returns array values that matches given pattern (or values that keys matches)
      *
      * @param string $pattern       Pattern to match
-     * @param array  $array         The array (scalar values only)
-     * @param bool   $itsKeyPattern (optional) If is set to true, keys will be checked if they match pattern.
-     *                              Otherwise - values will be checked (default behaviour).
+     * @param array  $dataArray     The array
+     * @param bool   $itsKeyPattern (optional) If is set to true, keys are checks if they match pattern. Otherwise -
+     *                              values are checks.
      * @return array
      */
-    public static function getArrayValuesByPattern($pattern, array $array, $itsKeyPattern = false)
+    public static function getArrayValuesByPattern($pattern, $dataArray, $itsKeyPattern = false)
     {
-        /*
-         * No elements?
-         * Nothing to do
-         */
-        if (empty($array)) {
-            return [];
-        }
-
         if ($itsKeyPattern) {
             $effect = [];
 
-            foreach ($array as $key => $value) {
-                if ((bool)preg_match($pattern, $key)) {
-                    $effect[$key] = $value;
+            if (!empty($dataArray)) {
+                $matches = [];
+
+                foreach ($dataArray as $key => $value) {
+                    if (preg_match($pattern, $key, $matches)) {
+                        $effect[$key] = $value;
+                    }
                 }
             }
 
             return $effect;
         }
 
-        return preg_grep($pattern, $array);
+        return preg_grep($pattern, $dataArray);
     }
 
     /**
      * Filters array by given expression and column
      *
-     * Expression can be simple compare expression, like " == 2", or regular expression.
+     * Expression can be simple compare expression, like ' == 2', or regular expression.
      * Returns filtered array.
      *
-     * @param array  $array                The 2-dimensional array that should be filtered
+     * @param array  $array                The array that should be filtered
      * @param string $arrayColumnKey       Column name
-     * @param string $filterExpression     Simple filter expression (e.g. "== 2" or "!= \'home\'") or regular
-     *                                     expression (e.g. "/\d+/" or "/[a-z]+[,;]{2,}/")
-     * @param bool   $itsRegularExpression (optional) If is set to true, means that filter expression is a regular
-     *                                     expression. Otherwise - not (default behaviour).
+     * @param string $filterExpression     Filter expression, e.g. '== 2' or '!= \'home\''
+     * @param bool   $itsRegularExpression (optional) If is set to true, means that filter expression is a
+     *                                     regular expression
      * @return array
      */
     public static function arrayFilter($array, $arrayColumnKey, $filterExpression, $itsRegularExpression = false)
     {
-        /*
-         * No elements?
-         * Nothing to do
-         */
-        if (empty($array)) {
-            return [];
-        }
+        $effect = [];
 
-        $effect = $array;
+        if (!empty($array)) {
+            $effect = $array;
 
-        foreach ($effect as $key => &$item) {
-            if (!isset($item[$arrayColumnKey])) {
-                continue;
-            }
+            foreach ($effect as $key => &$item) {
+                if (isset($item[$arrayColumnKey])) {
+                    $value = $item[$arrayColumnKey];
 
-            $value = $item[$arrayColumnKey];
+                    if ($itsRegularExpression) {
+                        $matches = [];
+                        $pattern = '|' . $filterExpression . '|';
+                        $matchesCount = preg_match($pattern, $value, $matches);
 
-            if ($itsRegularExpression) {
-                $matchesCount = preg_match($filterExpression, $value);
-                $remove = 0 === $matchesCount;
-            } else {
-                if (is_string($value)) {
-                    $value = sprintf('\'%s\'', $value);
-                } elseif (is_bool($value)) {
-                    if (true === $value) {
-                        $value = 'true';
+                        $remove = 0 == $matchesCount;
                     } else {
-                        $value = 'false';
+                        if ('' == $value) {
+                            $value = '\'\'';
+                        } elseif (is_string($value)) {
+                            $value = '\'' . $value . '\'';
+                        }
+
+                        eval('$isTrue = ' . $value . $filterExpression . ';');
+
+                        /* @var bool $isTrue */
+                        $remove = !$isTrue;
+                    }
+
+                    if ($remove) {
+                        unset($effect[$key]);
                     }
                 }
-
-                eval(sprintf('$isEqual = %s%s;', $value, $filterExpression));
-
-                /* @var bool $isEqual */
-                $remove = !$isEqual;
-            }
-
-            if ($remove) {
-                unset($effect[$key]);
             }
         }
 
@@ -284,40 +210,37 @@ class Regex
     }
 
     /**
-     * Performs regular expression match with many given patterns.
+     * Perform regular expression match with many given patterns.
      * Returns information if given $subject matches one or all given $patterns.
      *
      * @param array|string $patterns     The patterns to match
      * @param string       $subject      The string to check
      * @param bool         $mustAllMatch (optional) If is set to true, $subject must match all $patterns. Otherwise -
-     *                                   not (default behaviour).
+     *                                   not.
      * @return bool
      */
     public static function pregMultiMatch($patterns, $subject, $mustAllMatch = false)
     {
-        /*
-         * No patterns?
-         * Nothing to do
-         */
-        if (empty($patterns)) {
-            return false;
-        }
-
         $effect = false;
         $patterns = Arrays::makeArray($patterns);
 
-        if ($mustAllMatch) {
-            $effect = true;
-        }
-
-        foreach ($patterns as $pattern) {
-            $matched = (bool)preg_match_all($pattern, $subject);
-
+        if (!empty($patterns)) {
             if ($mustAllMatch) {
-                $effect = $effect && $matched;
-            } elseif ($matched) {
-                $effect = $matched;
-                break;
+                $effect = true;
+            }
+
+            foreach ($patterns as $pattern) {
+                $matches = [];
+                $matched = (bool)preg_match_all($pattern, $subject, $matches);
+
+                if ($mustAllMatch) {
+                    $effect = $effect && $matched;
+                } else {
+                    if ($matched) {
+                        $effect = $matched;
+                        break;
+                    }
+                }
             }
         }
 
@@ -508,7 +431,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;
             }
 
@@ -529,7 +452,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;
         }
 
@@ -614,7 +537,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;
         }
 
@@ -701,14 +624,14 @@ class Regex
      */
     public static function isValidNip($nip)
     {
-        $nip = preg_replace('/[\D]/', '', $nip);
+        $nip = preg_replace('/[^0-9]/', '', $nip);
 
         $invalidNips = [
             '1234567890',
             '0000000000',
         ];
 
-        if (!preg_match('/^[\d]{10}$/', $nip) || in_array($nip, $invalidNips, true)) {
+        if (!preg_match('/^[0-9]{10}$/', $nip) || in_array($nip, $invalidNips)) {
             return false;
         }
 
@@ -730,9 +653,9 @@ class Regex
         }
 
         $modulo = $sum % 11;
-        $numberControl = (10 === $modulo) ? 0 : $modulo;
+        $numberControl = (10 == $modulo) ? 0 : $modulo;
 
-        return $numberControl === (int)$nip[9];
+        return $numberControl == $nip[9];
     }
 
     /**
@@ -753,14 +676,6 @@ class Regex
      */
     public static function isValidMoneyValue($value)
     {
-        /*
-         * Not a scalar value?
-         * Nothing to do
-         */
-        if (!is_scalar($value)) {
-            return false;
-        }
-
         $pattern = self::getMoneyPattern();
 
         return (bool)preg_match($pattern, $value);
@@ -773,245 +688,39 @@ class Regex
      * @param string $color          Color to verify
      * @param bool   $throwException (optional) If is set to true, throws an exception if given color is invalid
      *                               (default behaviour). Otherwise - not.
+     * @return string|bool
+     *
      * @throws IncorrectColorHexLengthException
      * @throws InvalidColorHexValueException
-     * @return string|bool
      */
     public static function getValidColorHexValue($color, $throwException = true)
     {
-        /*
-         * Not a scalar value?
-         * Nothing to do
-         */
-        if (!is_scalar($color)) {
-            return false;
-        }
-
         $color = Miscellaneous::replace($color, '/#/', '');
         $length = strlen($color);
 
-        /*
-         * Color is not 3 or 6 characters long?
-         * Nothing to do
-         */
-        if (3 !== $length && 6 !== $length) {
-            if ($throwException) {
-                throw new IncorrectColorHexLengthException($color);
-            }
-
-            return false;
-        }
-
-        /*
-         * Color is 3 characters long?
-         * Let's make it 6 characters long
-         */
         if (3 === $length) {
             $color = Miscellaneous::replace($color, '/(.)(.)(.)/', '$1$1$2$2$3$3');
+        } else {
+            if (6 !== $length) {
+                if ($throwException) {
+                    throw new IncorrectColorHexLengthException($color);
+                }
+
+                return false;
+            }
         }
 
         $pattern = self::$patterns['color'];
         $match = (bool)preg_match($pattern, $color);
 
-        /*
-         * It's valid color
-         * Nothing to do more
-         */
-        if ($match) {
-            return strtolower($color);
-        }
+        if (!$match) {
+            if ($throwException) {
+                throw new InvalidColorHexValueException($color);
+            }
 
-        if ($throwException) {
-            throw new InvalidColorHexValueException($color);
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns information if given name of bundle is valid
-     *
-     * @param string $bundleName Full name of bundle to verify, e.g. "MyExtraBundle"
-     * @return bool
-     */
-    public static function isValidBundleName($bundleName)
-    {
-        /*
-         * Not a string?
-         * Nothing to do
-         */
-        if (!is_string($bundleName)) {
             return false;
         }
 
-        $pattern = self::getBundleNamePattern();
-
-        return (bool)preg_match($pattern, $bundleName);
-    }
-
-    /**
-     * Returns pattern used to validate / verify name of bundle
-     *
-     * @return string
-     */
-    public static function getBundleNamePattern()
-    {
-        return self::$patterns['bundleName'];
-    }
-
-    /**
-     * Returns pattern used to validate / verify html attribute
-     *
-     * @return string
-     */
-    public static function getHtmlAttributePattern()
-    {
-        return self::$patterns['htmlAttribute'];
-    }
-
-    /**
-     * Returns information if given html attribute is valid
-     *
-     * @param string $htmlAttribute The html attribute to verify
-     * @return bool
-     */
-    public static function isValidHtmlAttribute($htmlAttribute)
-    {
-        /*
-         * Not a string?
-         * Nothing to do
-         */
-        if (!is_string($htmlAttribute)) {
-            return false;
-        }
-
-        $pattern = self::getHtmlAttributePattern();
-
-        return (bool)preg_match($pattern, $htmlAttribute);
-    }
-
-    /**
-     * Returns information if given html attributes are valid
-     *
-     * @param string $htmlAttributes The html attributes to verify
-     * @return bool
-     */
-    public static function areValidHtmlAttributes($htmlAttributes)
-    {
-        /*
-         * Not a string?
-         * Nothing to do
-         */
-        if (!is_string($htmlAttributes)) {
-            return false;
-        }
-
-        $pattern = self::getHtmlAttributePattern();
-
-        return (bool)preg_match_all($pattern, $htmlAttributes);
-    }
-
-    /**
-     * Returns information if given value is a binary value
-     *
-     * @param string $value Value to verify
-     * @return bool
-     */
-    public static function isBinaryValue($value)
-    {
-        /*
-         * Not a string?
-         * Nothing to do
-         */
-        if (!is_string($value)) {
-            return false;
-        }
-
-        $pattern = self::$patterns['binaryValue'];
-
-        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);
+        return strtolower($color);
     }
 }

src/Utilities/Repository.php

@@ -14,148 +14,72 @@ use Doctrine\ORM\QueryBuilder;
 /**
  * Useful methods for repository
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class Repository
 {
-    /**
-     * Name of key responsible for sorting/position of an item in array
-     *
-     * @var string
-     */
-    const POSITION_KEY = 'position';
-
     /**
      * Replenishes positions of given items
      *
-     * @param array $items  Objects who have "getPosition()" and "setPosition()" methods or arrays
-     * @param bool  $asLast (optional) If is set to true, items are placed at the end (default behaviour). Otherwise -
-     *                      at top.
+     * @param array $items  The items
+     * @param bool  $asLast (optional) If is set to true, items are placed at the end. Otherwise - at the top.
      * @param bool  $force  (optional) If is set to true, positions are set even there is no extreme position.
-     *                      Otherwise - if extreme position is unknown (is null) replenishment is stopped / skipped
-     *                      (default behaviour).
+     *                      Otherwise - if extreme position is not found (is null) replenishment is stopped / skipped.
      */
-    public static function replenishPositions(array &$items, $asLast = true, $force = false)
+    public static function replenishPositions($items, $asLast = true, $force = false)
     {
         $position = self::getExtremePosition($items, $asLast);
 
-        /*
-         * Extreme position is unknown, but it's required?
-         * Use 0 as default/start value
-         */
         if (null === $position && $force) {
             $position = 0;
         }
 
-        /*
-         * Extreme position is unknown or there are no items to sort?
-         * Nothing to do
-         */
-        if (null === $position || empty($items)) {
-            return;
-        }
+        if (null !== $position && !empty($items)) {
+            foreach ($items as $item) {
+                if (method_exists($item, 'getPosition')) {
+                    if (null === $item->getPosition()) {
+                        if ($asLast) {
+                            ++$position;
+                        } else {
+                            --$position;
+                        }
 
-        foreach ($items as &$item) {
-            /*
-             * The item is not sortable?
-             */
-            if (!self::isSortable($item)) {
-                continue;
+                        if (method_exists($item, 'setPosition')) {
+                            $item->setPosition($position);
+                        }
+                    }
+                }
             }
-
-            /*
-             * Position has been set?
-             * Nothing to do
-             */
-            if (self::isSorted($item)) {
-                continue;
-            }
-
-            /*
-             * Calculate position
-             */
-            if ($asLast) {
-                ++$position;
-            } else {
-                --$position;
-            }
-
-            /*
-             * It's an object?
-             * Use proper method to set position
-             */
-            if (is_object($item)) {
-                $item->setPosition($position);
-                continue;
-            }
-
-            /*
-             * It's an array
-             * Use proper key to set position
-             */
-            $item[static::POSITION_KEY] = $position;
         }
     }
 
     /**
      * Returns extreme position (max or min) of given items
      *
-     * @param array $items Objects who have "getPosition()" and "setPosition()" methods or arrays
+     * @param array $items The items
      * @param bool  $max   (optional) If is set to true, maximum value is returned. Otherwise - minimum.
      * @return int
      */
-    public static function getExtremePosition(array $items, $max = true)
+    public static function getExtremePosition($items, $max = true)
     {
-        /*
-         * No items?
-         * Nothing to do
-         */
-        if (empty($items)) {
-            return null;
-        }
-
         $extreme = null;
 
-        foreach ($items as $item) {
-            /*
-             * The item is not sortable?
-             */
-            if (!self::isSortable($item)) {
-                continue;
-            }
+        if (!empty($items)) {
+            foreach ($items as $item) {
+                if (Reflection::hasMethod($item, 'getPosition')) {
+                    $position = $item->getPosition();
 
-            $position = null;
-
-            /*
-             * Let's grab the position
-             */
-            if (is_object($item)) {
-                $position = $item->getPosition();
-            } elseif (array_key_exists(static::POSITION_KEY, $item)) {
-                $position = $item[static::POSITION_KEY];
-            }
-
-            /*
-             * Maximum value is expected?
-             */
-            if ($max) {
-                /*
-                 * Position was found and it's larger than previously found position (the extreme position)?
-                 */
-                if (null === $extreme || (null !== $position && $position > $extreme)) {
-                    $extreme = $position;
+                    if ($max) {
+                        if ($position > $extreme) {
+                            $extreme = $position;
+                        }
+                    } else {
+                        if ($position < $extreme) {
+                            $extreme = $position;
+                        }
+                    }
                 }
-
-                continue;
-            }
-
-            /*
-             * Minimum value is expected here.
-             * Position was found and it's smaller than previously found position (the extreme position)?
-             */
-            if (null === $extreme || (null !== $position && $position < $extreme)) {
-                $extreme = $position;
             }
         }
 
@@ -177,62 +101,9 @@ class Repository
         $direction = 'ASC'
     ) {
         $alias = 'qb';
-        $queryBuilder = $repository->createQueryBuilder($alias);
 
-        if (empty($property)) {
-            return $queryBuilder;
-        }
-
-        return $queryBuilder->orderBy(sprintf('%s.%s', $alias, $property), $direction);
-    }
-
-    /**
-     * Returns information if given item is sortable
-     *
-     * Sortable means it's an:
-     * - array
-     * or
-     * - object and has getPosition() and setPosition()
-     *
-     * @param mixed $item An item to verify (object who has "getPosition()" and "setPosition()" methods or an array)
-     * @return bool
-     */
-    private static function isSortable($item)
-    {
-        return is_array($item)
-            ||
-            (
-                is_object($item)
-                &&
-                Reflection::hasMethod($item, 'getPosition')
-                &&
-                Reflection::hasMethod($item, 'setPosition')
-            );
-    }
-
-    /**
-     * Returns information if given item is sorted (position has been set)
-     *
-     * @param mixed $item An item to verify (object who has "getPosition()" and "setPosition()" methods or an array)
-     * @return bool
-     */
-    private static function isSorted($item)
-    {
-        /*
-         * Given item is not sortable?
-         */
-        if (!self::isSortable($item)) {
-            return false;
-        }
-
-        /*
-         * It's an object or it's an array
-         * and position has been set?
-         */
-
-        return
-            (is_object($item) && null !== $item->getPosition())
-            ||
-            (is_array($item) && isset($item[static::POSITION_KEY]));
+        return $repository
+            ->createQueryBuilder($alias)
+            ->orderBy(sprintf('%s.%s', $alias, $property), $direction);
     }
 }

src/Utilities/Uri.php

@@ -11,8 +11,8 @@ namespace Meritoo\Common\Utilities;
 /**
  * Useful uri methods (only static functions)
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class Uri
 {
@@ -24,25 +24,13 @@ class Uri
      */
     public static function getFullUri($withoutHost = false)
     {
-        $requestedUrl = Miscellaneous::getSafelyGlobalVariable(INPUT_SERVER, 'REQUEST_URI');
+        $effect = Miscellaneous::getSafelyGlobalVariable(INPUT_SERVER, 'REQUEST_URI');
 
-        /*
-         * Unknown requested url?
-         * Nothing to do
-         */
-        if (empty($requestedUrl)) {
-            return '';
-        }
-
-        /*
-         * Without host / server name?
-         * All is done
-         */
         if ($withoutHost) {
-            return $requestedUrl;
+            return $effect;
         }
 
-        return self::getServerNameOrIp(true) . $requestedUrl;
+        return self::getServerNameOrIp(true) . $effect;
     }
 
     /**
@@ -53,25 +41,13 @@ class Uri
      */
     public static function getServerNameOrIp($withProtocol = false)
     {
-        $host = Miscellaneous::getSafelyGlobalVariable(INPUT_SERVER, 'HTTP_HOST');
+        $protocol = '';
 
-        /*
-         * Unknown host / server?
-         * Nothing to do
-         */
-        if (empty($host)) {
-            return '';
-        }
-
-        /*
-         * With protocol?
-         * Let's include the protocol
-         */
         if ($withProtocol) {
-            return sprintf('%s://%s', self::getProtocolName(), $host);
+            $protocol .= self::getProtocolName() . '://';
         }
 
-        return $host;
+        return $protocol . Miscellaneous::getSafelyGlobalVariable(INPUT_SERVER, 'HTTP_HOST');
     }
 
     /**
@@ -81,6 +57,8 @@ class Uri
      */
     public static function getProtocolName()
     {
+        $effect = '';
+
         $matches = [];
         $protocolData = Miscellaneous::getSafelyGlobalVariable(INPUT_SERVER, 'SERVER_PROTOCOL'); // e.g. HTTP/1.1
         $matchCount = preg_match('|(.+)\/(.+)|', $protocolData, $matches);
@@ -90,14 +68,11 @@ class Uri
          * $matches[2] - protocol version, e.g. 1.1
          */
 
-        /*
-         * Oops, cannot match protocol
-         */
-        if (0 === $matchCount) {
-            return '';
+        if ($matchCount > 0) {
+            $effect = strtolower($matches[1]);
         }
 
-        return strtolower($matches[1]);
+        return $effect;
     }
 
     /**
@@ -107,7 +82,13 @@ class Uri
      */
     public static function getRefererUri()
     {
-        return Miscellaneous::getSafelyGlobalVariable(INPUT_SERVER, 'HTTP_REFERER');
+        $effect = '';
+
+        if (filter_has_var(INPUT_SERVER, 'HTTP_REFERER')) {
+            $effect = Miscellaneous::getSafelyGlobalVariable(INPUT_SERVER, 'HTTP_REFERER');
+        }
+
+        return $effect;
     }
 
     /**
@@ -233,35 +214,10 @@ class Uri
      */
     public static function isExternalUrl($url)
     {
-        /*
-         * Unknown url or it's just slash?
-         * Nothing to do
-         */
-        if (empty($url) || '/' === $url) {
-            return false;
-        }
-
         $currentUrl = self::getServerNameOrIp(true);
         $url = self::replenishProtocol($url);
 
-        /*
-         * Let's prepare pattern of current url
-         */
-        $search = [
-            ':',
-            '/',
-            '.',
-        ];
-
-        $replace = [
-            '\:',
-            '\/',
-            '\.',
-        ];
-
-        $currentUrlPattern = str_replace($search, $replace, $currentUrl);
-
-        return !Regex::contains($url, $currentUrlPattern);
+        return !Regex::contains($currentUrl, $url);
     }
 
     /**
@@ -317,14 +273,6 @@ class Uri
      */
     public static function getSecuredUrl($url, $user = '', $password = '')
     {
-        /*
-         * Url is not provided?
-         * Nothing to do
-         */
-        if (empty($url)) {
-            return '';
-        }
-
         $protocol = self::getProtocolName();
         $host = self::getServerNameOrIp();
 

src/Utilities/Xml.php

@@ -15,8 +15,8 @@ use SimpleXMLElement;
 /**
  * Useful XML-related methods (only static functions)
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class Xml
 {
@@ -40,7 +40,7 @@ class Xml
         $query = $path->query('/*/*');
         $nodesCount = $query->length;
 
-        if (0 === $nodesCount) {
+        if (0 == $nodesCount) {
             return $element1;
         }
 

src/ValueObject/Address.php

@@ -1,159 +0,0 @@
-<?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

@@ -1,81 +0,0 @@
-<?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

@@ -1,101 +0,0 @@
-<?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

@@ -1,22 +0,0 @@
-<?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

@@ -1,245 +0,0 @@
-<?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

@@ -1,179 +0,0 @@
-<?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;
-
-/**
- * Version of software
- *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
- */
-class Version
-{
-    /**
-     * The "major" part.
-     * Incremented when you make incompatible API changes.
-     *
-     * @var int
-     */
-    protected $majorPart;
-
-    /**
-     * The "minor" part.
-     * Incremented when you add functionality in a backwards-compatible manner.
-     *
-     * @var int
-     */
-    protected $minorPart;
-
-    /**
-     * The "patch" part.
-     * Incremented when you make backwards-compatible bug fixes.
-     *
-     * @var int
-     */
-    protected $patchPart;
-
-    /**
-     * Class constructor
-     *
-     * @param int $majorPart The "major" part. Incremented when you make incompatible API changes.
-     * @param int $minorPart The "minor" part. Incremented when you add functionality in a backwards-compatible manner.
-     * @param int $patchPart The "patch" part. Incremented when you make backwards-compatible bug fixes.
-     */
-    public function __construct($majorPart, $minorPart, $patchPart)
-    {
-        $this->majorPart = $majorPart;
-        $this->minorPart = $minorPart;
-        $this->patchPart = $patchPart;
-    }
-
-    /**
-     * Returns the "major" part.
-     * Incremented when you make incompatible API changes.
-     *
-     * @return int
-     */
-    public function getMajorPart()
-    {
-        return $this->majorPart;
-    }
-
-    /**
-     * Returns the "minor" part.
-     * Incremented when you add functionality in a backwards-compatible manner.
-     *
-     * @return int
-     */
-    public function getMinorPart()
-    {
-        return $this->minorPart;
-    }
-
-    /**
-     * Returns the "patch" part.
-     * Incremented when you make backwards-compatible bug fixes.
-     *
-     * @return int
-     */
-    public function getPatchPart()
-    {
-        return $this->patchPart;
-    }
-
-    /**
-     * Returns representation of object as string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return sprintf('%d.%d.%d', $this->getMajorPart(), $this->getMinorPart(), $this->getPatchPart());
-    }
-
-    /**
-     * Returns new instance based on given version as string.
-     * Given version should contain 3 dot-separated integers, 1 per each part ("major", "minor" and "patch").
-     *
-     * Examples:
-     * "1.0.2";
-     * "10.4.0";
-     *
-     * @param string $version The version
-     * @return Version|null
-     */
-    public static function fromString($version)
-    {
-        $version = trim($version);
-
-        /*
-         * No version provided?
-         * Nothing to do
-         */
-        if (empty($version)) {
-            return null;
-        }
-
-        $matches = [];
-        $pattern = '/^(\d+)\.(\d+)\.(\d+)$/'; // e.g. "1.0.2"
-        $matched = preg_match($pattern, $version, $matches);
-
-        /*
-         * Incorrect version?
-         * Nothing to do
-         */
-        if (0 === $matched || false === $matched) {
-            return null;
-        }
-
-        $majorPart = (int)$matches[1];
-        $minorPart = (int)$matches[2];
-        $patchPart = (int)$matches[3];
-
-        return new static($majorPart, $minorPart, $patchPart);
-    }
-
-    /**
-     * Returns new instance based on given version as array.
-     * Given version should contain 3 integers, 1 per each part ("major", "minor" and "patch").
-     *
-     * Examples:
-     * [1, 0, 2];
-     * [10, 4, 0];
-     *
-     * @param array $version The version
-     * @return Version|null
-     */
-    public static function fromArray(array $version)
-    {
-        /*
-         * No version provided?
-         * Nothing to do
-         */
-        if (empty($version)) {
-            return null;
-        }
-
-        $count = count($version);
-
-        /*
-         * Incorrect version?
-         * Nothing to do
-         */
-        if (3 !== $count) {
-            return null;
-        }
-
-        $majorPart = (int)$version[0];
-        $minorPart = (int)$version[1];
-        $patchPart = (int)$version[2];
-
-        return new static($majorPart, $minorPart, $patchPart);
-    }
-}

tests/Collection/CollectionTest.php

@@ -6,10 +6,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Test\Common\Collection;
+namespace Meritoo\Common\Test\Collection;
 
 use ArrayIterator;
-use Generator;
 use Meritoo\Common\Collection\Collection;
 use Meritoo\Common\Test\Base\BaseTestCase;
 use Meritoo\Common\Type\OopVisibilityType;
@@ -17,8 +16,8 @@ use Meritoo\Common\Type\OopVisibilityType;
 /**
  * Test case of the collection of elements
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class CollectionTest extends BaseTestCase
 {
@@ -45,12 +44,12 @@ class CollectionTest extends BaseTestCase
 
     public function testEmptyCollection()
     {
-        static::assertSame(0, $this->emptyCollection->count());
+        static::assertEquals(0, $this->emptyCollection->count());
         static::assertCount(0, $this->emptyCollection);
         static::assertEmpty($this->emptyCollection);
 
         static::assertTrue($this->emptyCollection->isEmpty());
-        static::assertSame([], $this->emptyCollection->toArray());
+        static::assertEquals([], $this->emptyCollection->toArray());
         static::assertEmpty($this->emptyCollection->toArray());
 
         static::assertNull($this->emptyCollection->getFirst());
@@ -61,23 +60,23 @@ class CollectionTest extends BaseTestCase
 
     public function testNotEmptyCollection()
     {
-        static::assertSame(4, $this->simpleCollection->count());
+        static::assertEquals(4, $this->simpleCollection->count());
         static::assertCount(4, $this->simpleCollection);
         static::assertNotEmpty($this->simpleCollection);
 
         static::assertFalse($this->simpleCollection->isEmpty());
-        static::assertSame($this->simpleElements, $this->simpleCollection->toArray());
+        static::assertEquals($this->simpleElements, $this->simpleCollection->toArray());
         static::assertNotEmpty($this->simpleCollection->toArray());
 
-        static::assertSame('lorem', $this->simpleCollection->getFirst());
-        static::assertSame('sit', $this->simpleCollection->getLast());
-        static::assertSame('dolor', $this->simpleCollection[123]);
+        static::assertEquals('lorem', $this->simpleCollection->getFirst());
+        static::assertEquals('sit', $this->simpleCollection->getLast());
+        static::assertEquals('dolor', $this->simpleCollection[123]);
     }
 
     public function testCount()
     {
-        static::assertSame(0, $this->emptyCollection->count());
-        static::assertSame(4, $this->simpleCollection->count());
+        static::assertEquals(0, $this->emptyCollection->count());
+        static::assertEquals(4, $this->simpleCollection->count());
     }
 
     public function testOffsetExists()
@@ -94,8 +93,8 @@ class CollectionTest extends BaseTestCase
         static::assertNull($this->emptyCollection['abc']);
         static::assertNull($this->simpleCollection['abc']);
 
-        static::assertSame('lorem', $this->simpleCollection[0]);
-        static::assertSame('sit', $this->simpleCollection[345]);
+        static::assertEquals('lorem', $this->simpleCollection[0]);
+        static::assertEquals('sit', $this->simpleCollection[345]);
     }
 
     public function testOffsetSet()
@@ -104,10 +103,10 @@ class CollectionTest extends BaseTestCase
         $this->simpleCollection['test2'] = 5678;
 
         static::assertTrue($this->emptyCollection->has(1234));
-        static::assertSame(1234, $this->emptyCollection['test1']);
+        static::assertEquals(1234, $this->emptyCollection['test1']);
 
         static::assertTrue($this->simpleCollection->has(5678));
-        static::assertSame(5678, $this->simpleCollection['test2']);
+        static::assertEquals(5678, $this->simpleCollection['test2']);
     }
 
     public function testOffsetUnset()
@@ -115,14 +114,14 @@ class CollectionTest extends BaseTestCase
         unset($this->simpleCollection[0]);
 
         static::assertFalse($this->simpleCollection->has('lorem'));
-        static::assertSame('ipsum', $this->simpleCollection[1]);
-        static::assertSame(3, $this->simpleCollection->count());
+        static::assertEquals('ipsum', $this->simpleCollection[1]);
+        static::assertEquals(3, $this->simpleCollection->count());
 
         unset($this->simpleCollection[123]);
 
         static::assertFalse($this->simpleCollection->has('dolor'));
-        static::assertSame('ipsum', $this->simpleCollection[1]);
-        static::assertSame(2, $this->simpleCollection->count());
+        static::assertEquals('ipsum', $this->simpleCollection[1]);
+        static::assertEquals(2, $this->simpleCollection->count());
     }
 
     public function testGetIterator()
@@ -130,46 +129,29 @@ class CollectionTest extends BaseTestCase
         static::assertInstanceOf(ArrayIterator::class, $this->simpleCollection->getIterator());
     }
 
-    /**
-     * @param mixed      $element       The element to add
-     * @param int        $expectedCount Expected count of elements in collection
-     * @param int        $expectedIndex Expected index of added element in collection
-     * @param Collection $collection    The collection
-     *
-     * @dataProvider provideElementToAdd
-     */
-    public function testAddWithoutIndex($element, $expectedCount, $expectedIndex, Collection $collection)
+    public function testAdd()
     {
-        $collection->add($element);
+        $this->emptyCollection->add('test1');
 
-        static::assertTrue($collection->has($element));
-        static::assertSame($expectedCount, $collection->count());
-        static::assertSame($element, $collection[$expectedIndex]);
+        static::assertTrue($this->emptyCollection->has('test1'));
+        static::assertEquals(1, $this->emptyCollection->count());
+        static::assertEquals('test1', $this->emptyCollection[0]);
     }
 
-    /**
-     * @param mixed      $element       The element to add
-     * @param mixed      $index         Index of element to add
-     * @param int        $expectedCount Expected count of elements in collection
-     * @param int        $expectedIndex Expected index of added element in collection
-     * @param Collection $collection    The collection
-     *
-     * @dataProvider provideElementToAddWithIndex
-     */
-    public function testAddWithIndex($element, $index, $expectedCount, $expectedIndex, Collection $collection)
+    public function testAddWithIndex()
     {
-        $collection->add($element, $index);
+        $this->emptyCollection->add('test2', 1234);
 
-        static::assertTrue($collection->has($element));
-        static::assertSame($expectedCount, $collection->count());
-        static::assertSame($element, $collection[$expectedIndex]);
+        static::assertTrue($this->emptyCollection->has('test2'));
+        static::assertEquals(1, $this->emptyCollection->count());
+        static::assertEquals('test2', $this->emptyCollection[1234]);
     }
 
     public function testAddMultipleUsingEmptyArray()
     {
         $this->emptyCollection->addMultiple([]);
 
-        static::assertSame(0, $this->emptyCollection->count());
+        static::assertEquals(0, $this->emptyCollection->count());
         static::assertTrue($this->emptyCollection->isEmpty());
     }
 
@@ -185,12 +167,12 @@ class CollectionTest extends BaseTestCase
         $this->emptyCollection->addMultiple($elements);
 
         static::assertFalse($this->emptyCollection->isEmpty());
-        static::assertSame(4, $this->emptyCollection->count());
+        static::assertEquals(4, $this->emptyCollection->count());
 
-        static::assertSame('test1', $this->emptyCollection[0]);
-        static::assertSame('test2', $this->emptyCollection[1]);
-        static::assertSame('test3', $this->emptyCollection[2]);
-        static::assertSame('test4', $this->emptyCollection[3]);
+        static::assertEquals('test1', $this->emptyCollection[0]);
+        static::assertEquals('test2', $this->emptyCollection[1]);
+        static::assertEquals('test3', $this->emptyCollection[2]);
+        static::assertEquals('test4', $this->emptyCollection[3]);
     }
 
     public function testAddMultipleUsingIndexes()
@@ -205,12 +187,12 @@ class CollectionTest extends BaseTestCase
         $this->emptyCollection->addMultiple($elements, true);
 
         static::assertFalse($this->emptyCollection->isEmpty());
-        static::assertSame(4, $this->emptyCollection->count());
+        static::assertEquals(4, $this->emptyCollection->count());
 
-        static::assertSame('test1', $this->emptyCollection[0]);
-        static::assertSame('test2', $this->emptyCollection[1]);
-        static::assertSame('test3', $this->emptyCollection[1234]);
-        static::assertSame('test4', $this->emptyCollection[5678]);
+        static::assertEquals('test1', $this->emptyCollection[0]);
+        static::assertEquals('test2', $this->emptyCollection[1]);
+        static::assertEquals('test3', $this->emptyCollection[1234]);
+        static::assertEquals('test4', $this->emptyCollection[5678]);
     }
 
     public function testPrepend()
@@ -218,14 +200,14 @@ class CollectionTest extends BaseTestCase
         $this->emptyCollection->prepend('lorem-ipsum');
 
         static::assertFalse($this->emptyCollection->isEmpty());
-        static::assertSame(1, $this->emptyCollection->count());
-        static::assertSame('lorem-ipsum', $this->emptyCollection[0]);
+        static::assertEquals(1, $this->emptyCollection->count());
+        static::assertEquals('lorem-ipsum', $this->emptyCollection[0]);
 
         $this->simpleCollection->prepend('lorem-ipsum');
 
         static::assertFalse($this->simpleCollection->isEmpty());
-        static::assertSame(5, $this->simpleCollection->count());
-        static::assertSame('lorem-ipsum', $this->simpleCollection[0]);
+        static::assertEquals(5, $this->simpleCollection->count());
+        static::assertEquals('lorem-ipsum', $this->simpleCollection[0]);
     }
 
     public function testRemoveNotExistingElement()
@@ -233,24 +215,24 @@ class CollectionTest extends BaseTestCase
         $this->emptyCollection->remove('abc');
 
         static::assertTrue($this->emptyCollection->isEmpty());
-        static::assertSame(0, $this->emptyCollection->count());
+        static::assertEquals(0, $this->emptyCollection->count());
 
         $this->simpleCollection->remove('abc');
 
         static::assertFalse($this->simpleCollection->isEmpty());
-        static::assertSame(4, $this->simpleCollection->count());
+        static::assertEquals(4, $this->simpleCollection->count());
     }
 
     public function testRemove()
     {
         static::assertFalse($this->simpleCollection->isEmpty());
-        static::assertSame(4, $this->simpleCollection->count());
-        static::assertSame('ipsum', $this->simpleCollection[1]);
+        static::assertEquals(4, $this->simpleCollection->count());
+        static::assertEquals('ipsum', $this->simpleCollection[1]);
 
         $this->simpleCollection->remove('ipsum');
 
         static::assertFalse($this->simpleCollection->isEmpty());
-        static::assertSame(3, $this->simpleCollection->count());
+        static::assertEquals(3, $this->simpleCollection->count());
         static::assertNull($this->simpleCollection[1]);
     }
 
@@ -290,8 +272,8 @@ class CollectionTest extends BaseTestCase
         static::assertNull($this->simpleCollection->getPrevious('abc'));
         static::assertNull($this->simpleCollection->getPrevious('lorem'));
 
-        static::assertSame('lorem', $this->simpleCollection->getPrevious('ipsum'));
-        static::assertSame('dolor', $this->simpleCollection->getPrevious('sit'));
+        static::assertEquals('lorem', $this->simpleCollection->getPrevious('ipsum'));
+        static::assertEquals('dolor', $this->simpleCollection->getPrevious('sit'));
     }
 
     public function testGetNext()
@@ -300,26 +282,26 @@ class CollectionTest extends BaseTestCase
         static::assertNull($this->simpleCollection->getNext('abc'));
         static::assertNull($this->simpleCollection->getNext('sit'));
 
-        static::assertSame('dolor', $this->simpleCollection->getNext('ipsum'));
-        static::assertSame('sit', $this->simpleCollection->getNext('dolor'));
+        static::assertEquals('dolor', $this->simpleCollection->getNext('ipsum'));
+        static::assertEquals('sit', $this->simpleCollection->getNext('dolor'));
     }
 
     public function testGetFirst()
     {
         static::assertNull($this->emptyCollection->getFirst());
-        static::assertSame('lorem', $this->simpleCollection->getFirst());
+        static::assertEquals('lorem', $this->simpleCollection->getFirst());
     }
 
     public function testGetLast()
     {
         static::assertNull($this->emptyCollection->getLast());
-        static::assertSame('sit', $this->simpleCollection->getLast());
+        static::assertEquals('sit', $this->simpleCollection->getLast());
     }
 
     public function testToArray()
     {
-        static::assertSame([], $this->emptyCollection->toArray());
-        static::assertSame($this->simpleElements, $this->simpleCollection->toArray());
+        static::assertEquals([], $this->emptyCollection->toArray());
+        static::assertEquals($this->simpleElements, $this->simpleCollection->toArray());
     }
 
     public function testExistsVisibilityAndArguments()
@@ -327,167 +309,6 @@ 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
-     *
-     * @return Generator
-     */
-    public function provideElementToAdd()
-    {
-        $collection = new Collection();
-
-        yield[
-            'test1',
-            1,
-            0,
-            $collection,
-        ];
-
-        yield[
-            'test2',
-            2,
-            1,
-            $collection,
-        ];
-
-        yield[
-            'test3',
-            3,
-            2,
-            $collection,
-        ];
-    }
-
-    /**
-     * Provides element with index to add to collection
-     *
-     * @return Generator
-     */
-    public function provideElementToAddWithIndex()
-    {
-        $collection = new Collection();
-
-        yield[
-            'test1',
-            'aa',
-            1,
-            'aa',
-            $collection,
-        ];
-
-        yield[
-            'test2',
-            'oo',
-            2,
-            'oo',
-            $collection,
-        ];
-
-        yield[
-            'test3',
-            null,
-            3,
-            0,
-            $collection,
-        ];
-
-        yield[
-            'test4',
-            '',
-            4,
-            1,
-            $collection,
-        ];
-
-        yield[
-            'test5',
-            'vv',
-            5,
-            'vv',
-            $collection,
-        ];
-    }
-
-    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\Test\Common\Exception\Base;
+namespace Meritoo\Common\Test\Exception\Base;
 
 use Meritoo\Common\Exception\Base\UnknownTypeException;
 use Meritoo\Common\Test\Base\BaseTestCase;
@@ -16,14 +16,14 @@ use Meritoo\Common\Type\OopVisibilityType;
 /**
  * Test case of the exception used while type of something is unknown
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class UnknownTypeExceptionTest extends BaseTestCase
 {
     public function testConstructorVisibilityAndArguments()
     {
-        static::assertConstructorVisibilityAndArguments(UnknownTestTypeException::class, OopVisibilityType::IS_PUBLIC, 3);
+        static::assertConstructorVisibilityAndArguments(UnknownTestTypeException::class, OopVisibilityType::IS_PUBLIC, 1, 1);
     }
 
     public function testWithoutException()
@@ -41,8 +41,8 @@ class UnknownTypeExceptionTest extends BaseTestCase
 /**
  * Type of something (for testing purposes)
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class TestType extends BaseType
 {
@@ -54,31 +54,27 @@ class TestType extends BaseType
 /**
  * An exception used while type of something is unknown (for testing purposes)
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class UnknownTestTypeException extends UnknownTypeException
 {
     /**
-     * Creates exception
+     * Class constructor
      *
-     * @param string $unknownType The unknown type of something (for testing purposes)
-     * @return UnknownTestTypeException
+     * @param int|string $unknownType The unknown type of something (for testing purposes)
      */
-    public static function createException($unknownType)
+    public function __construct($unknownType)
     {
-        /* @var UnknownTestTypeException $exception */
-        $exception = parent::create($unknownType, new TestType(), 'type of something used for testing');
-
-        return $exception;
+        parent::__construct($unknownType, new TestType(), 'type of something used for testing');
     }
 }
 
 /**
  * Service used together with type of something (for testing purposes)
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class TestService
 {
@@ -86,8 +82,9 @@ class TestService
      * Returns translated type (for testing purposes)
      *
      * @param string $type Type of something (for testing purposes)
-     * @throws UnknownTestTypeException
      * @return string
+     *
+     * @throws UnknownTestTypeException
      */
     public function getTranslatedType($type)
     {

tests/Exception/Bundle/IncorrectBundleNameExceptionTest.php

@@ -1,74 +0,0 @@
-<?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,10 +6,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Test\Common\Exception\Date;
+namespace Meritoo\Common\Test\Exception\Date;
 
 use Generator;
-use Meritoo\Common\Exception\Type\UnknownDatePartTypeException;
+use Meritoo\Common\Exception\Date\UnknownDatePartTypeException;
 use Meritoo\Common\Test\Base\BaseTestCase;
 use Meritoo\Common\Type\DatePartType;
 use Meritoo\Common\Type\OopVisibilityType;
@@ -17,14 +17,14 @@ use Meritoo\Common\Type\OopVisibilityType;
 /**
  * Test case of an exception used while type of date part, e.g. "year", is unknown
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class UnknownDatePartTypeExceptionTest extends BaseTestCase
 {
     public function testConstructorVisibilityAndArguments()
     {
-        static::assertConstructorVisibilityAndArguments(UnknownDatePartTypeException::class, OopVisibilityType::IS_PUBLIC, 3);
+        static::assertConstructorVisibilityAndArguments(UnknownDatePartTypeException::class, OopVisibilityType::IS_PUBLIC, 2, 2);
     }
 
     /**
@@ -34,10 +34,10 @@ class UnknownDatePartTypeExceptionTest extends BaseTestCase
      *
      * @dataProvider provideDatePartAndValue
      */
-    public function testMessage($unknownDatePart, $value, $expectedMessage)
+    public function testConstructorMessage($unknownDatePart, $value, $expectedMessage)
     {
-        $exception = UnknownDatePartTypeException::createException($unknownDatePart, $value);
-        static::assertSame($expectedMessage, $exception->getMessage());
+        $exception = new UnknownDatePartTypeException($unknownDatePart, $value);
+        static::assertEquals($expectedMessage, $exception->getMessage());
     }
 
     /**

tests/Exception/File/EmptyFileExceptionTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Test\Common\Exception\File;
+namespace Meritoo\Common\Test\Exception\File;
 
 use Generator;
 use Meritoo\Common\Exception\File\EmptyFileException;
@@ -16,14 +16,14 @@ use Meritoo\Common\Type\OopVisibilityType;
 /**
  * Test case of an exception used while file with given path is empty (has no content)
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class EmptyFileExceptionTest extends BaseTestCase
 {
     public function testConstructorVisibilityAndArguments()
     {
-        static::assertConstructorVisibilityAndArguments(EmptyFileException::class, OopVisibilityType::IS_PUBLIC, 3);
+        static::assertConstructorVisibilityAndArguments(EmptyFileException::class, OopVisibilityType::IS_PUBLIC, 1, 1);
     }
 
     /**
@@ -32,10 +32,10 @@ class EmptyFileExceptionTest extends BaseTestCase
      *
      * @dataProvider providePathOfFile
      */
-    public function testMessage($emptyFilePath, $expectedMessage)
+    public function testConstructorMessage($emptyFilePath, $expectedMessage)
     {
-        $exception = EmptyFileException::create($emptyFilePath);
-        static::assertSame($expectedMessage, $exception->getMessage());
+        $exception = new EmptyFileException($emptyFilePath);
+        static::assertEquals($expectedMessage, $exception->getMessage());
     }
 
     /**

tests/Exception/File/EmptyFilePathExceptionTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Test\Common\Exception\File;
+namespace Meritoo\Common\Test\Exception\File;
 
 use Meritoo\Common\Exception\File\EmptyFilePathException;
 use Meritoo\Common\Test\Base\BaseTestCase;
@@ -15,19 +15,19 @@ use Meritoo\Common\Type\OopVisibilityType;
 /**
  * Test case of an exception used while path of given file is empty
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class EmptyFilePathExceptionTest extends BaseTestCase
 {
     public function testConstructorVisibilityAndArguments()
     {
-        static::assertConstructorVisibilityAndArguments(EmptyFilePathException::class, OopVisibilityType::IS_PUBLIC, 3);
+        static::assertConstructorVisibilityAndArguments(EmptyFilePathException::class, OopVisibilityType::IS_PUBLIC);
     }
 
     public function testConstructorMessage()
     {
-        $exception = EmptyFilePathException::create();
-        static::assertSame('Path of the file is empty. Did you provide path of proper file?', $exception->getMessage());
+        $exception = new EmptyFilePathException();
+        static::assertEquals('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\Test\Common\Exception\File;
+namespace Meritoo\Common\Test\Exception\File;
 
 use Generator;
 use Meritoo\Common\Exception\File\NotExistingFileException;
@@ -16,14 +16,14 @@ use Meritoo\Common\Type\OopVisibilityType;
 /**
  * Test case of an exception used while file with given path does not exist
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class NotExistingFileExceptionTest extends BaseTestCase
 {
     public function testConstructorVisibilityAndArguments()
     {
-        static::assertConstructorVisibilityAndArguments(NotExistingFileException::class, OopVisibilityType::IS_PUBLIC, 3);
+        static::assertConstructorVisibilityAndArguments(NotExistingFileException::class, OopVisibilityType::IS_PUBLIC, 1, 1);
     }
 
     /**
@@ -34,8 +34,8 @@ class NotExistingFileExceptionTest extends BaseTestCase
      */
     public function testConstructorMessage($notExistingFilePath, $expectedMessage)
     {
-        $exception = NotExistingFileException::create($notExistingFilePath);
-        static::assertSame($expectedMessage, $exception->getMessage());
+        $exception = new NotExistingFileException($notExistingFilePath);
+        static::assertEquals($expectedMessage, $exception->getMessage());
     }
 
     /**

tests/Exception/Method/DisabledMethodExceptionTest.php

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Meritoo\Test\Common\Exception\Method;
+namespace Meritoo\Common\Test\Exception\Method;
 
 use Generator;
 use Meritoo\Common\Exception\Method\DisabledMethodException;
@@ -16,14 +16,14 @@ use Meritoo\Common\Type\OopVisibilityType;
 /**
  * Test case of an exception used while method cannot be called, because is disabled
  *
- * @author    Meritoo <github@meritoo.pl>
- * @copyright Meritoo <http://www.meritoo.pl>
+ * @author    Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
+ * @copyright Meritoo.pl
  */
 class DisabledMethodExceptionTest extends BaseTestCase
 {
     public function testConstructorVisibilityAndArguments()
     {
-        static::assertConstructorVisibilityAndArguments(DisabledMethodException::class, OopVisibilityType::IS_PUBLIC, 3);
+        static::assertConstructorVisibilityAndArguments(DisabledMethodException::class, OopVisibilityType::IS_PUBLIC, 2, 1);
     }
 
     /**
@@ -36,8 +36,8 @@ class DisabledMethodExceptionTest extends BaseTestCase
      */
     public function testConstructorMessage($disabledMethod, $alternativeMethod, $expectedMessage)
     {
-        $exception = DisabledMethodException::create($disabledMethod, $alternativeMethod);
-        static::assertSame($expectedMessage, $exception->getMessage());
+        $exception = new DisabledMethodException($disabledMethod, $alternativeMethod);
+        static::assertEquals($expectedMessage, $exception->getMessage());
     }
 
     /**