V2 (#26)

Author: yoanm

.scrutinizer.yml

@@ -10,25 +10,19 @@ build_failure_conditions:
     - 'issues.label("coding-style").exists'        # No coding style issues allowed
 build:
     dependencies:
-        before:
-            - composer global require hirak/prestissimo
         override:
             - make build
     tests:
         stop_on_failure: true
         override:
-            - php-scrutinizer-run
-            -
-                command: make codestyle
-                analysis:
-                      file: 'build/reports/cs-data'
-                      format: 'php-cs-checkstyle'
             -
                 command: make coverage
                 idle_timeout: 1200
                 coverage:
                     file: 'build/coverage/clover.xml'
                     format: 'php-clover'
+            - php-scrutinizer-run --enable-security-analysis
+            - make codestyle
     cache:
         directories:
             - ~/.composer
@@ -38,11 +32,9 @@ build:
         variables:
             CI: 'true'
             TEST_OUTPUT_STYLE: 'pretty'
+            COMPOSER_OPTIONS: '--optimize-autoloader'
             COVERAGE_OUTPUT_STYLE: 'clover'
             COVERAGE_CLOVER_FILE_PATH: 'build/coverage/clover.xml'
-            PHPCS_REPORT_STYLE: 'checkstyle'
-            PHPCS_REPORT_FILE: 'build/reports/cs-data'
-            COMPOSER_OPTIONS: '--optimize-autoloader'
         php:
             version: "7.1"
         timezone: UTC

.travis.yml

@@ -1,19 +1,16 @@
 language: php
 
 php:
-  - '7.0'
   - '7.1'
   - '7.2'
+  - '7.3'
 
 env:
   global:
     CI: 'true'
     TEST_OUTPUT_STYLE: 'pretty'
     PHPCS_REPORT_STYLE: 'full'
     COMPOSER_OPTIONS: '--optimize-autoloader'
-  matrix:
-    - SDK_VERSION: '~1.2'
-    - SDK_VERSION: '~2.0'
 
 sudo: false
 
@@ -22,10 +19,9 @@ matrix:
 
 before_install:
   # remove xdebug to speed up build
-  - phpenv config-rm xdebug.ini
+  - phpenv config-rm xdebug.ini || true
 
 install:
-  - composer require yoanm/jsonrpc-server-sdk:$SDK_VERSION
   - make build
 script:
   - make test-technical

README.md

@@ -135,7 +135,7 @@ You have many ways to inject you json-rpc methods :
    ```yaml
    # config/config.yaml
    json_rpc_http_server: 
-       http_endpoint_path: '/my-custom-endpoint'
+       endpoint: '/my-custom-endpoint'
    ```
    
  - Or you can define your own route and bind the endpoint as below :

behat.yml

@@ -2,5 +2,4 @@ default:
   suites:
     default:
       contexts:
-        - Tests\Functional\BehatContext\SymfonyExtensionContext: ~
         - Tests\Functional\BehatContext\DemoAppContext: ~

composer.json

@@ -1,49 +1,48 @@
 {
-    "name": "yoanm/symfony-jsonrpc-http-server",
-    "description": "Symfony Server SDK to convert an HTTP json-rpc request into HTTP json-rpc response",
-    "license": "GPL-3.0-only",
-    "type": "library",
-    "support": {
-        "issues": "https://github.com/yoanm/symfony-jsonrpc-http-server/issues"
-    },
-    "authors": [
-        {
-            "name": "Yoanm",
-            "email": "yoanm@users.noreply.github.com",
-            "role": "Developer"
-        }
-    ],
-    "autoload": {
-        "psr-4": {
-            "Yoanm\\SymfonyJsonRpcHttpServer\\": "src"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\": "tests",
-            "Tests\\Functional\\BehatContext\\": "features/bootstrap",
-            "DemoApp\\": "features/demo_app/src"
-        }
-    },
-    "require": {
-        "php": ">7.0",
-        "yoanm/jsonrpc-server-sdk": "~1.2 || ~2.0",
-        "symfony/http-foundation": "^3.0 || ^4.0",
-        "symfony/dependency-injection": "^3.0 || ^4.0",
-        "yoanm/jsonrpc-server-sdk-psr11-resolver": "^2.0"
-    },
-    "suggest": {
-        "symfony/http-kernel": "To ease integration inside your application by using JsonRpcHttpServerBundle"
-    },
-    "require-dev": {
-        "behat/behat": "~3.0",
-        "squizlabs/php_codesniffer": "3.*",
-        "phpunit/phpunit": "^6.0 || ^7.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^2.0 || ^3.0",
-        "matthiasnoback/symfony-config-test": "^3.0 || ^4.0",
-        "symfony/framework-bundle": "^3.4",
-        "symfony/http-kernel": "^3.4",
-        "symfony/routing": "^3.4",
-        "yoanm/php-unit-extended": "~1.0"
+  "name": "yoanm/symfony-jsonrpc-http-server",
+  "description": "Symfony Server SDK to convert an HTTP json-rpc request into HTTP json-rpc response",
+  "license": "MIT",
+  "minimum-stability": "dev",
+  "type": "library",
+  "support": {
+    "issues": "https://github.com/yoanm/symfony-jsonrpc-http-server/issues"
+  },
+  "authors": [
+    {
+      "name": "Yoanm",
+      "email": "yoanm@users.noreply.github.com",
+      "role": "Developer"
     }
+  ],
+  "autoload": {
+    "psr-4": {
+      "Yoanm\\SymfonyJsonRpcHttpServer\\": "src"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Tests\\": "tests",
+      "Tests\\Functional\\BehatContext\\": "features/bootstrap",
+      "DemoApp\\": "features/demo_app/src"
+    }
+  },
+  "require": {
+    "php": ">=7.1",
+    "yoanm/jsonrpc-server-sdk": "dev-release/3.0.0",
+    "symfony/http-foundation": "^3.0 || ^4.0",
+    "symfony/http-kernel": "^3.0 || ^4.0",
+    "symfony/config": "^3.0 || ^4.0",
+    "symfony/dependency-injection": "^3.0 || ^4.0"
+  },
+  "require-dev": {
+    "behat/behat": "~3.0",
+    "squizlabs/php_codesniffer": "3.*",
+    "phpunit/phpunit": "^6.0 || ^7.0",
+    "matthiasnoback/symfony-dependency-injection-test": "^2.0 || ^3.0",
+    "matthiasnoback/symfony-config-test": "^3.0 || ^4.0",
+    "symfony/framework-bundle": "^3.4",
+    "symfony/http-kernel": "^3.4",
+    "symfony/routing": "^3.4",
+    "yoanm/php-unit-extended": "~1.0"
+  }
 }

features/bootstrap/DemoAppContext.php

@@ -5,10 +5,6 @@
 use Behat\Gherkin\Node\PyStringNode;
 use DemoApp\AbstractKernel;
 use DemoApp\DefaultKernel;
-use DemoApp\KernelWithBundle;
-use DemoApp\KernelWithBundleAndCustomResolver;
-use DemoApp\KernelWithBundleAndMethodsMapping;
-use DemoApp\KernelWithCustomResolver;
 use PHPUnit\Framework\Assert;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -20,37 +16,6 @@ class DemoAppContext implements Context
 {
     /** @var Response|null */
     private $lastResponse;
-    /** @var bool */
-    private $useCustomResolver = false;
-    /** @var bool */
-    private $useBundle = false;
-    /** @var bool */
-    private $useBundleMethodsMappingFromConfiguration = false;
-
-    /**
-     * @Given I use my DemoApp custom method resolver
-     */
-    public function givenIUseMyDemoAppCustomMethodResolve()
-    {
-        $this->useCustomResolver = true;
-    }
-
-    /**
-     * @Given DemoApp will use JsonRpcHttpServerBundle
-     */
-    public function givenDemoAppWillUseBundle()
-    {
-        $this->useBundle = true;
-    }
-
-    /**
-     * @Given DemoApp will use JsonRpcHttpServerBundle with methods mapping configuration
-     */
-    public function givenDemoAppWillUseBundleWithMethodsMappingConfiguration()
-    {
-        $this->givenDemoAppWillUseBundle();
-        $this->useBundleMethodsMappingFromConfiguration = true;
-    }
 
     /**
      * @When I send following :httpMethod input on :uri demoApp kernel endpoint:
@@ -88,16 +53,6 @@ protected function getDemoAppKernel()
     {
         $env = 'prod';
         $debug = true;
-        switch (true) {
-            case true === $this->useBundleMethodsMappingFromConfiguration:
-                return new KernelWithBundleAndMethodsMapping($env, $debug);
-            case true === $this->useBundle && true === $this->useCustomResolver:
-                return new KernelWithBundleAndCustomResolver($env, $debug);
-            case true === $this->useBundle && false === $this->useCustomResolver:
-                return new KernelWithBundle($env, $debug);
-            case false === $this->useBundle && true === $this->useCustomResolver:
-                return new KernelWithCustomResolver($env, $debug);
-        }
 
         return new DefaultKernel($env, $debug);
     }