Merge remote-tracking branch 'origin/master'

Author: moay

composer.json

@@ -8,7 +8,7 @@
         "czproject/git-php": "^3.12",
         "php-http/httplug-pack": "^1.1",
         "psr/simple-cache": "^1.0",
-        "robinvdvleuten/ulid": "^1.1",
+        "robinvdvleuten/ulid": "^3.0",
         "sensio/framework-extra-bundle": "^5.1",
         "symfony/apache-pack": "^1.0",
         "symfony/asset": "^4.0",
@@ -25,6 +25,7 @@
         "symfony/yaml": "^4.0"
     },
     "require-dev": {
+        "symfony/browser-kit": "^4.1",
         "symfony/debug-pack": "^1.0",
         "symfony/phpunit-bridge": "^4.0",
         "symfony/web-server-bundle": "^4.0"
@@ -68,7 +69,6 @@
     },
     "extra": {
         "symfony": {
-            "id": "01C6C88WKQP047F412R9EYCFV0",
             "allow-contrib": false
         }
     }

composer.lock

@@ -0,0 +1,3 @@
+sensio_framework_extra:
+    router:
+        annotations: false

config/packages/sensio_framework_extra.yaml

@@ -2,11 +2,11 @@
 
 In order to run the server, you'll need a server which
 
-* is capable of running Symfony 4. This means: PHP 7.1
+* is capable of running Symfony 4. This means: PHP 7.2
 * has git installed
 * has Composer installed
 * is able to load the repos. That means: Access to the internet is needed, also some free disk space.
 
 It is recommended to setup some sort of monitoring. We use [Sentry](https://sentry.io).
 
-SSH access is useful to run [commands](commands.md) on the server. 
+SSH access is useful to run [commands](commands.md) on the server. 

docs/topics/prerequisites.md

@@ -27,6 +27,6 @@ class UlidProvider
      */
     public function provideUlid()
     {
-        return strtoupper(Ulid::generate());
+        return (string) Ulid::generate();
     }
 }

src/Service/Provider/UlidProvider.php

@@ -65,9 +65,6 @@
             "config/packages/nyholm_psr7.yaml"
         ]
     },
-    "paragonie/random_compat": {
-        "version": "v2.0.11"
-    },
     "php-http/cache-plugin": {
         "version": "v1.5.0"
     },
@@ -158,6 +155,9 @@
     "symfony/asset": {
         "version": "v4.0.4"
     },
+    "symfony/browser-kit": {
+        "version": "v4.3.4"
+    },
     "symfony/cache": {
         "version": "v4.0.4"
     },
@@ -194,6 +194,9 @@
     "symfony/dependency-injection": {
         "version": "v4.0.4"
     },
+    "symfony/dom-crawler": {
+        "version": "v4.3.4"
+    },
     "symfony/dotenv": {
         "version": "v4.0.4"
     },

symfony.lock

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Tests\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+class EndpointControllerTest extends WebTestCase
+{
+    public function testUlid()
+    {
+        $client = self::createClient();
+
+        $client->request('GET', '/ulid');
+        $response = $client->getResponse();
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals('application/json', $response->headers->get('Content-Type'));
+
+        $data = json_decode($response->getContent(), true);
+
+        $this->assertEquals(JSON_ERROR_NONE, json_last_error());
+        $this->assertArrayHasKey('ulid', $data);
+    }
+}

tests/Controller/EndpointControllerTest.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Tests\Service\Provider;
+
+use App\Service\Provider\UlidProvider;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+class UlidProviderTest extends KernelTestCase
+{
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+        self::bootKernel();
+    }
+
+    public function testServiceIsAvailable()
+    {
+        $ulidProvider = self::$container->get(UlidProvider::class);
+        $this->assertInstanceOf(UlidProvider::class, $ulidProvider);
+
+        return $ulidProvider;
+    }
+
+    /**
+     * @depends testServiceIsAvailable
+     *
+     * @param UlidProvider $ulidProvider
+     */
+    public function testUlidLength(UlidProvider $ulidProvider)
+    {
+        $this->assertSame(26, strlen((string) $ulidProvider->provideUlid()));
+    }
+
+    /**
+     * @depends testServiceIsAvailable
+     *
+     * @param UlidProvider $ulidProvider
+     */
+    public function testUlidIsUppercased(UlidProvider $ulidProvider)
+    {
+        $this->assertRegExp('/[0-9][A-Z]/', (string) $ulidProvider->provideUlid());
+    }
+}