Object return types, require PHP 7.2

.travis.yml

@@ -1,14 +1,13 @@
 language: php
 
 php:
-  - 7.1
   - 7.2
   - 7.3
   - 7.4
 
 matrix:
   include:
-    - php: 7.1.0
+    - php: 7.2.0
       env: dependencies=lowest
 
 before_script:

composer.json

@@ -13,8 +13,8 @@
     ],
     "license": "MIT",
     "require": {
-        "php": ">=7.1",
-        "brick/di": "~0.2.0",
+        "php": ">=7.2",
+        "brick/di": "~0.3.0",
         "brick/event": "~0.1.0",
         "brick/html": "~0.1.0",
         "brick/http": "~0.2.0",

src/Event/ControllerInvocatedEvent.php

@@ -70,7 +70,7 @@ public function getRouteMatch() : RouteMatch
      *
      * @return object|null
      */
-    public function getControllerInstance()
+    public function getControllerInstance() : ?object
     {
         return $this->instance;
     }

src/Event/ControllerReadyEvent.php

@@ -88,7 +88,7 @@ public function getRouteMatch() : RouteMatch
      *
      * @return object|null
      */
-    public function getControllerInstance()
+    public function getControllerInstance() : ?object
     {
         return $this->instance;
     }

src/Event/NonResponseResultEvent.php

@@ -91,7 +91,7 @@ public function getRouteMatch() : RouteMatch
      *
      * @return object|null
      */
-    public function getControllerInstance()
+    public function getControllerInstance() : ?object
     {
         return $this->instance;
     }

src/Event/ResponseReceivedEvent.php

@@ -95,7 +95,7 @@ public function getRouteMatch() : RouteMatch
      *
      * @return object|null
      */
-    public function getControllerInstance()
+    public function getControllerInstance() : ?object
     {
         return $this->instance;
     }

src/ObjectPacker/DateTimePacker.php

@@ -62,7 +62,7 @@ public function pack($object) : ?PackedObject
     /**
      * {@inheritdoc}
      */
-    public function unpack(PackedObject $packedObject)
+    public function unpack(PackedObject $packedObject) : ?object
     {
         $class = $packedObject->getClass();
         $data  = $packedObject->getData();

src/ObjectPacker/DoctrinePacker.php

@@ -56,7 +56,7 @@ public function pack($object) : ?PackedObject
     /**
      * {@inheritdoc}
      */
-    public function unpack(PackedObject $packedObject)
+    public function unpack(PackedObject $packedObject) : ?object
     {
         $class = $packedObject->getClass();
 

src/ObjectPacker/GeometryPacker.php

@@ -42,7 +42,7 @@ public function pack($object) : ?PackedObject
     /**
      * {@inheritdoc}
      */
-    public function unpack(PackedObject $packedObject)
+    public function unpack(PackedObject $packedObject) : ?object
     {
         $class = $packedObject->getClass();
         $data  = $packedObject->getData();

src/ObjectPacker/NullPacker.php

@@ -20,7 +20,7 @@ public function pack($object) : ?PackedObject
     /**
      * {@inheritdoc}
      */
-    public function unpack(PackedObject $packedObject)
+    public function unpack(PackedObject $packedObject) : ?object
     {
         return null;
     }

src/ObjectPacker/ObjectPacker.php

@@ -52,5 +52,5 @@ public function pack($object) : ?PackedObject;
      * @throws ObjectNotConvertibleException If the class name is supported, but the representation is not valid.
      * @throws ObjectNotFoundException       If the class name is supported, but the object cannot be found.
      */
-    public function unpack(PackedObject $packedObject);
+    public function unpack(PackedObject $packedObject) : ?object;
 }

src/ObjectPacker/PackerChain.php

@@ -43,7 +43,7 @@ public function pack($object) : ?PackedObject
     /**
      * {@inheritdoc}
      */
-    public function unpack(PackedObject $packedObject)
+    public function unpack(PackedObject $packedObject) : ?object
     {
         foreach ($this->objectPackers as $objectPacker) {
             $object = $objectPacker->unpack($packedObject);

src/Plugin/AbstractAnnotationPlugin.php

@@ -50,7 +50,7 @@ public function __construct(Reader $annotationReader)
      *
      * @return object|null The annotation, or null if not found.
      */
-    protected function getControllerAnnotation(\ReflectionFunctionAbstract $controller, string $annotationClass)
+    protected function getControllerAnnotation(\ReflectionFunctionAbstract $controller, string $annotationClass) : ?object
     {
         if ($controller instanceof \ReflectionMethod) {
             $annotations = $this->annotationReader->getMethodAnnotations($controller);

src/Plugin/ObjectUnpackPlugin.php

@@ -111,7 +111,7 @@ private function getParameterValue(\ReflectionParameter $parameter, $value)
      *
      * @throws HttpException If the object cannot be instantiated.
      */
-    private function getObject(string $className, $value)
+    private function getObject(string $className, $value) : object
     {
         $packedObject = new PackedObject($className, $value);