Merge branch 'version-2.x'

.php_cs.dist

@@ -29,8 +29,6 @@ return PhpCsFixer\Config::create()
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->exclude('tests/Fixtures')
-            ->in(__DIR__ . '/bin')
-            ->in(__DIR__ . '/src')
             ->in(__DIR__ . '/tests')
     )
 ;

.scrutinizer.yml

@@ -1,43 +0,0 @@
-filter:
-    paths: [src/*]
-    excluded_paths: [vendor/*, test/*]
-before_commands:
-    - 'composer install --dev --prefer-source'
-tools:
-    external_code_coverage: false
-    php_mess_detector: true
-    php_code_sniffer: true
-    sensiolabs_security_checker: true
-    php_code_coverage: true
-    php_pdepend: true
-    php_loc:
-        enabled: true
-        excluded_dirs: [vendor, test]
-    php_cpd:
-        enabled: true
-        excluded_dirs: [vendor, test]
-build:
-    nodes:
-        php5-tests:
-            environment:
-                postgresql: false
-                mysql: false
-                redis: false
-                php:
-                    version: 5.6.9
-            tests:
-                override:
-                    -
-                        command: ./vendor/bin/codecept build -c tests && ./vendor/bin/codecept run acceptance -c tests
-        php7-tests:
-            environment:
-                postgresql: false
-                mysql: false
-                redis: false
-                php:
-                    version: 7.2.13
-            tests:
-                override:
-                    -
-                        command: ./vendor/bin/codecept build -c tests && ./vendor/bin/codecept run acceptance -c tests
-

composer.json

@@ -1,46 +1,28 @@
 {
-    "keywords" : [
-        "http",
-        "mock",
-        "server",
-        "external",
-        "acceptance",
-        "tests"
-    ],
-    "authors" : [
-        {
-            "name" : "Mariano Custiel",
-            "email" : "jmcustiel@gmail.com",
-            "homepage" : "https://github.com/mcustiel",
-            "role" : "Developer"
-        }
-    ],
-    "autoload" : {
-        "psr-4" : {
-            "Mcustiel\\Phiremock\\" : "src"
-        }
-    },
-    "name" : "mcustiel/phiremock",
-    "type" : "project",
-    "description" : "A mocker for HTTP and REST services",
-    "license" : "GPL-3.0-or-later",
-    "require" : {
-        "php" : ">=5.6",
-        "react/http" : "~0.7.0 || ~0.8.0",
-        "mcustiel/php-simple-request" : "^3.1",
-        "symfony/cache": "^3.1||^4.0||^5.0",
-        "mcustiel/power-route" : "^3.0.0",
-        "mcustiel/php-simple-di" : "^1.2.1",
-        "guzzlehttp/guzzle" : "^6.0",
-        "monolog/monolog" : "^1.17.2||^2.0"
-    },
-    "require-dev" : {
-        "codeception/codeception" : "^2.2.10"
-    },
-    "suggest" : {
-        "ext-pcntl" : "Allows phiremock to handle system signals"
-    },
-    "bin" : [
-        "bin/phiremock"
-    ]
+	"keywords" : [
+		"http",
+		"mock",
+		"server",
+		"external",
+		"acceptance",
+		"tests"
+	],
+	"authors" : [{
+			"name" : "Mariano Custiel",
+			"email" : "jmcustiel@gmail.com",
+			"homepage" : "https://github.com/mcustiel",
+			"role" : "Administrator"
+		}
+	],
+	"name" : "mcustiel/phiremock",
+	"type" : "project",
+	"description" : "A mocker for HTTP and REST services. Full bundle.",
+	"license" : "GPL-3.0-or-later",
+	"require" : {
+		"php" : "^7.2",
+		"mcustiel/phiremock-server" : "v1.0.0",
+		"mcustiel/phiremock-client" : "v1.0.0"
+	},
+	"minimum-stability" : "dev",
+	"prefer-stable" : true
 }