Merge branch 'release/0.1.0'

.travis.yml

@@ -1,22 +1,26 @@
 language: php
 sudo: false
+
 php:
-- '7.1'
-- '7.2'
+  - "7.1"
+  - "7.2"
+  - "7.3"
+
 cache:
   directories:
-  - "$HOME/.composer/cache"
-before_script:
-- composer install --prefer-dist --no-interaction
-- composer require --dev php-coveralls/php-coveralls
+    - $HOME/.composer/cache
+
+install:
+  - composer install --prefer-dist --no-interaction
+
 script:
-- mkdir -p build/logs
-- vendor/bin/phpunit --coverage-clover build/logs/clover.xml
-- vendor/bin/php-cs-fixer fix --config=vendor/ixocreate/coding-standard/.php_cs -v --dry-run --using-cache=no --path-mode=intersection
-  `git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE`
+  - if [ $TRAVIS_PHP_VERSION = '7.2' ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; else vendor/bin/phpunit; fi
+  - if [ $TRAVIS_PHP_VERSION = '7.2' ]; then vendor/bin/php-cs-fixer fix --config=vendor/ixocreate/coding-standard/.php_cs -v --dry-run --using-cache=no --path-mode=intersection `git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE`; fi
+
 after_success:
-- travis_retry php vendor/bin/php-coveralls -v
+  - if [ $TRAVIS_PHP_VERSION = '7.2' ]; then php vendor/bin/php-coveralls -v; fi
+
 notifications:
   email: false
   slack:
-    secure: D8n3a+huB9ZEBE3pILS4ObLAtjW+OTCJUUgVL8aQ9q19N1XI9nd+dS5AEyluWPyTnvFdBHaT7aTNog5RMvSE8jrrW5+9L0lx++qLelSd5qrtnQB0zLtUR0HEaxn6LEQ8cUbch8o3vOy0w5EsFI6v+EQugByrHdCj64P14Tj9YpE57kSMjYBfh6jVbMg7a9XRkk8stx0VluQgQSJuKYQ/B2T8gkxKc+Q49e7frG2eqylxzKhRH3TTFl8L2DRgqPGQCKgpSYgNg6mdy9YpUdys622rC93AQwRJpFnmeQM44VyabHxWc9LW7zy3AZAZbH4IzYWyQM8R2nkqZ0UXPjxNto1s5j+jhPTFLmF0TvsoyrxT4P9bkeGqPC18jE+V4J11jaAfgWUKC3Ey7Mh5+kPYGyu7qgReXJMzyq2+JbwDy66dyNaZLsevPxoOjDlPIviRuNgHqM8pfITqEeUNxjj+GpGEwSpcu2lutePBWeLwLQ7A+F8fw8OOByrY7l4iF/tzdwLaDW4DJCpNqtaHqzTqsZb6NnzEO1ZDCqAJYX2FjI6LX4fJlqHk5hrYoIV4REPNFMn/gwxhW8LknwTyH7O9NJBmEkmAHEOOdYwHea1vY5IFBCBbDW0yFYzbkCGRkE5zkiJi7IrLcpDhehhrIpqZ3RpLtoH+hmL48Gz9X+1SCu4=
+    secure: "Kx7SNNjoSA/nPPAq5UF6bTnpaMdaGI/BWIVHXfO5vtm28M0c24YSz7TkDcSiidRpIhNEwEjQp7t680hErviiKtEXhUzdDwlOd5f1reLMeb92kCqUXYL3S++6aY87cMKVUJxdqoyzHGCfF9xORMe5/OR+P76ukxEUeKYBMm0JJu05t9kSj3remIE11yAeKo8pRad7N5D81rQ3DEmqJZz2qk80/oxf3JIBQLlQkxqkslzPaOkOPIwYD+J9KD/hpNsoiKZ7wlT/gKxxXgDSrS0UAKqQhyHKoIqc8ASITMruJjSxHxTq3IxzjaiHeNJp5ZKvpHmaAXMntcDhBrM1JRRLdVK1jhhoMZG+tMcJ3obX59umULxNnYdo9GnzoJlifvgs2lGXSrrEJzwhe9KSp2ErmzFo21ZeKRZRErsRm7/yYXffHMW/oeYBs99YlaSoIZsH9dJO0IOIzeC9TUSOsfuXoHa1QvzkEPDrooaiSA57AITHZvVl2TC4aTxzKGccnKzvK7fUM1mlT/DF3BqBFJARNayBk6rzn1AfMTxcvNt7QP0kEjFBC0bgfy1VnI/SXxfnXyDGBm8uZfrtFIL7PlQmLirHjus37PRa+XgFfA1W2YUZdbMrjtKORciCy2GOQ+GxOmeVoHseT9doMFGQUYv67oUzeBIggZMHTreqvBXdi7g="

CHANGELOG.md

@@ -0,0 +1,8 @@
+# Release Notes
+
+## [Unreleased](https://github.com/ixocreate/filter-package/compare/0.1.0...develop)
+
+## [v0.1.0 (2019-04-19)](https://github.com/ixocreate/filter-package/compare/master...0.1.0)
+
+### Changed
+- Consolidate Package

README.md

@@ -1,17 +1,17 @@
-# IXOCREATE filter
+# IXOCREATE Filter Package
 
-[![Build Status](https://travis-ci.com/ixocreate/filter.svg?branch=master)](https://travis-ci.com/ixocreate/filter)
-[![Coverage Status](https://coveralls.io/repos/github/ixocreate/filter/badge.svg?branch=develop)](https://coveralls.io/github/ixocreate/filter?branch=develop)
-[![Packagist](https://img.shields.io/packagist/v/ixocreate/filter.svg)](https://packagist.org/packages/ixocreate/filter)
-[![Packagist Pre Release](https://img.shields.io/packagist/vpre/ixocreate/filter.svg)](https://packagist.org/packages/ixocreate/filter)
-[![Packagist](https://img.shields.io/packagist/l/ixocreate/filter.svg)](https://packagist.org/packages/ixocreate/filter)
+[![Build Status](https://travis-ci.com/ixocreate/filter-package.svg?branch=master)](https://travis-ci.com/ixocreate/filter-package)
+[![Coverage Status](https://coveralls.io/repos/github/ixocreate/filter-package/badge.svg?branch=develop)](https://coveralls.io/github/ixocreate/filter-package?branch=develop)
+[![Packagist](https://img.shields.io/packagist/v/ixocreate/filter-package.svg)](https://packagist.org/packages/ixocreate/filter-package)
+[![PHP Version](https://img.shields.io/packagist/php-v/ixocreate/filter-package.svg)](https://packagist.org/packages/ixocreate/filter-package)
+[![License](https://img.shields.io/github/license/ixocreate/filter-package.svg)](LICENSE)
 
 ## Installation
 
 Install the package via composer:
 
 ```sh
-composer require ixocreate/filter
+composer require ixocreate/filter-package
 ```
 
 ## Testing
@@ -21,6 +21,18 @@ composer install --dev
 phpunit
 ```
 
+## Documentation
+
+Learn more about IXOCREATE by reading its [Documentation](https://ixocreate.github.io/).
+
+## Changelog
+
+Please see [CHANGELOG](CHANGELOG.md) for more information on what has changed recently.
+
+## Security Vulnerabilities
+
+If you discover security vulnerabilities, please address issues directly to opensource@ixocreate.com via e-mail.
+
 ## License
 
 The MIT License (MIT). Please see [LICENSE](LICENSE) for more information.

bootstrap/servicemanager.php

@@ -1,6 +1,10 @@
 <?php
 declare(strict_types=1);
+
 namespace Ixocreate\Filter;
 
+use Ixocreate\Application\Service\ServiceManagerConfigurator;
+
 /** @var ServiceManagerConfigurator $serviceManager */
+
 $serviceManager->addFactory(Filter::class);

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "ixocreate/filter-package",
-    "description": "Filter of IXOCREATE",
+    "description": "IXOCREATE Filter Package",
     "license": "MIT",
     "type": "library",
     "authors": [
@@ -12,12 +12,12 @@
     "prefer-stable": true,
     "require": {
         "php": "^7.1",
-        "ixocreate/contract": "=1.0.0-alpha2"
+        "ixocreate/application": "^0.1"
     },
     "require-dev": {
         "ixocreate/coding-standard": "^1.0",
-        "phpunit/phpunit": "^6.0.6",
-        "php-coveralls/php-coveralls": "^2.1"
+        "php-coveralls/php-coveralls": "^2.1",
+        "phpunit/phpunit": "^7.0"
     },
     "autoload": {
         "psr-4": {
@@ -26,8 +26,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "IxocreateTest\\Filter\\": "tests/src/",
-            "IxocreateMisc\\Filter\\": "tests/misc/"
+            "Ixocreate\\Test\\Filter\\": "tests/src/",
+            "Ixocreate\\Misc\\Filter\\": "tests/misc/"
         }
     },
     "scripts": {

phpunit.xml.dist

@@ -12,11 +12,10 @@
          timeoutForSmallTests="1"
          timeoutForMediumTests="10"
          timeoutForLargeTests="60"
-         strict="true"
          verbose="false"
 >
     <testsuites>
-        <testsuite name="filter test suite">
+        <testsuite name="IXOCREATE Test Suite">
             <directory>./tests/src</directory>
         </testsuite>
     </testsuites>
@@ -28,4 +27,4 @@
     <php>
         <ini name="date.timezone" value="UTC"/>
     </php>
-</phpunit>
+</phpunit>

src/Filter.php

@@ -9,8 +9,6 @@
 
 namespace Ixocreate\Filter;
 
-use Ixocreate\Contract\Filter\FilterableInterface;
-
 final class Filter
 {
     /**

src/FilterableInterface.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * @link https://github.com/ixocreate
+ * @copyright IXOCREATE GmbH
+ * @license MIT License
+ */
+
+declare(strict_types=1);
+
+namespace Ixocreate\Filter;
+
+interface FilterableInterface
+{
+    /**
+     * @return FilterableInterface
+     */
+    public function filter(): self;
+}

src/Package.php

@@ -9,10 +9,10 @@
 
 namespace Ixocreate\Filter;
 
-use Ixocreate\Contract\Application\ConfiguratorRegistryInterface;
-use Ixocreate\Contract\Application\PackageInterface;
-use Ixocreate\Contract\Application\ServiceRegistryInterface;
-use Ixocreate\Contract\ServiceManager\ServiceManagerInterface;
+use Ixocreate\Application\Configurator\ConfiguratorRegistryInterface;
+use Ixocreate\Application\Package\PackageInterface;
+use Ixocreate\Application\Service\ServiceRegistryInterface;
+use Ixocreate\ServiceManager\ServiceManagerInterface;
 
 final class Package implements PackageInterface
 {

tests/src/FilterTest.php

@@ -7,10 +7,10 @@
 
 declare(strict_types=1);
 
-namespace IxocreateTest\Validator;
+namespace Ixocreate\Test\Validator;
 
-use Ixocreate\Contract\Filter\FilterableInterface;
 use Ixocreate\Filter\Filter;
+use Ixocreate\Filter\FilterableInterface;
 use PHPUnit\Framework\TestCase;
 
 class FilterTest extends TestCase

tests/src/PackageTest.php

@@ -7,12 +7,12 @@
 
 declare(strict_types=1);
 
-namespace IxocreateTest\Test;
+namespace Ixocreate\Test\Test;
 
-use Ixocreate\Contract\Application\ConfiguratorRegistryInterface;
-use Ixocreate\Contract\Application\ServiceRegistryInterface;
-use Ixocreate\Contract\ServiceManager\ServiceManagerInterface;
+use Ixocreate\Application\Configurator\ConfiguratorRegistryInterface;
+use Ixocreate\Application\Service\ServiceRegistryInterface;
 use Ixocreate\Filter\Package;
+use Ixocreate\ServiceManager\ServiceManagerInterface;
 use PHPUnit\Framework\TestCase;
 
 class PackageTest extends TestCase