Merge pull request #5 from dlakomski/master

Fix deprecation notices from Symfony' InputBag

Author: dlakomski

.travis.yml

@@ -8,4 +8,4 @@ install:
   - composer install --dev
 
 script:
-  - ./vendor/bin/phpunit tests
+  - ./vendor/bin/phpunit

composer.json

@@ -10,7 +10,8 @@
     "require-dev": {
         "phpunit/phpunit": "^8.1",
         "symfony/console": "^5.0",
-        "symfony/http-kernel": "^5.0"
+        "symfony/http-kernel": "^5.0",
+        "symfony/error-handler": "^5.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<phpunit
+    bootstrap="tests/bootstrap.php"
+>
+    <testsuites>
+        <testsuite name="GW\Safe">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

src/SafeParameterBag.php

@@ -2,6 +2,7 @@
 
 namespace GW\Safe;
 
+use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 final class SafeParameterBag
@@ -25,6 +26,10 @@ public static function from(ParameterBag $params): self
      */
     public function value(string $key, $default)
     {
+        if ($this->params instanceof InputBag) {
+            return $this->params->all()[$key] ?? $default;
+        }
+
         return $this->params->get($key, $default);
     }
 }

tests/SafeParameterBagTest.php

@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+namespace tests\GW\Safe;
+
+use GW\Safe\SafeParameterBag;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\InputBag;
+
+class SafeParameterBagTest extends TestCase
+{
+    public function test_InputBag()
+    {
+        $safeBag = SafeParameterBag::from(new InputBag(['test' => 1, 'array' => ['abc' => 'def']]));
+
+        self::assertEquals(1, $safeBag->value('test', null));
+        self::assertEquals(2, $safeBag->value('not-exists', 2));
+        self::assertEquals(['abc' => 'def'], $safeBag->value('array', []));
+    }
+}

tests/SafeRequestTest.php

@@ -0,0 +1,30 @@
+<?php declare(strict_types=1);
+
+namespace tests\GW\Safe;
+
+use GW\Safe\SafeAssocArray;
+use GW\Safe\SafeRequest;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+
+class SafeRequestTest extends TestCase
+{
+    public function test_from()
+    {
+        $request = new Request(
+            ['query_param' => 1, 'query_array_param' => ['x' => 5]],
+            ['request_param' => 'test'],
+            ['attribute_param' => ['abc' => 'def']]
+        );
+        $safeRequest = SafeRequest::from($request);
+
+        self::assertEquals(1, $safeRequest->query()->int('query_param'));
+        self::assertEquals(SafeAssocArray::from(['x' => 5]), $safeRequest->query()->array('query_array_param'));
+        self::assertEquals(10, $safeRequest->query()->int('not_existent_param', 10));
+        self::assertEquals('test', $safeRequest->post()->string('request_param'));
+        self::assertEquals(
+            SafeAssocArray::from(['abc' => 'def']),
+            $safeRequest->attributes()->array('attribute_param')
+        );
+    }
+}

tests/bootstrap.php

@@ -0,0 +1,3 @@
+<?php
+
+\Symfony\Component\ErrorHandler\Debug::enable();