fix for #1 (better-serializer/better-serializer-bundle#1) + docker up…

…date to php 7.2 (#7)
better-serializer · May 17, 2018 · 92980d4 · 92980d4
1 parent 59e4511
commit 92980d4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 26 deletions.
diff --git a/config/di.pimple.php b/config/di.pimple.php
@@ -174,11 +174,7 @@ function () {
 };
 
 $container[BetterSerializer\DataBind\Writer\Type\ExtractorInterface::class] = function (Container $c) {
-    return $c[BetterSerializer\DataBind\Writer\Type\ExtractorBuilder::class]->build();
-};
-
-$container[BetterSerializer\DataBind\Writer\Type\ExtractorBuilder::class] = function () {
-    return new BetterSerializer\DataBind\Writer\Type\ExtractorBuilder();
+    return BetterSerializer\DataBind\Writer\Type\ExtractorBuilder::build();
 };
 
 $container[BetterSerializer\DataBind\Writer\Context\ContextFactoryInterface::class] = function () {

diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
@@ -1,9 +1,11 @@
-FROM php:7.1.13-cli
+FROM php:7.2.5-cli
 
 MAINTAINER Martin Fris <rasta@lj.sk>
 
 ENV REFRESHED_AT 2018-01-12
 
+RUN apt-get update && apt-get install -y git-core
+
 # Install xdebug
 RUN yes | pecl install xdebug && \
     echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini && \

diff --git a/docker/php/php.ini b/docker/php/php.ini
@@ -522,15 +522,6 @@ report_memleaks = On
 ; This setting is on by default.
 ;report_zend_debug = 0
 
-; Store the last error/warning message in $php_errormsg (boolean). Setting this value
-; to On can assist in debugging and is appropriate for development servers. It should
-; however be disabled on production servers.
-; Default Value: Off
-; Development Value: On
-; Production Value: Off
-; http://php.net/track-errors
-track_errors = On
-
 ; Turn off normal error reporting and emit XML-RPC error XML
 ; http://php.net/xmlrpc-errors
 ;xmlrpc_errors = 0
@@ -1929,4 +1920,4 @@ ldap.max_links = -1
 
 ; Local Variables:
 ; tab-width: 4
-; End:
+; End:
diff --git a/src/BetterSerializer/DataBind/Writer/Type/ExtractorBuilder.php b/src/BetterSerializer/DataBind/Writer/Type/ExtractorBuilder.php
@@ -13,17 +13,15 @@
 use BetterSerializer\DataBind\Writer\Type\Chain\SimpleMember;
 
 /**
- * Class ExtractorBuilder
- * @author mfris
- * @package BetterSerializer\DataBind\Writer\Type
+ *
  */
 final class ExtractorBuilder
 {
 
     /**
      * @return ExtractorInterface
      */
-    public function build(): ExtractorInterface
+    public static function build(): ExtractorInterface
     {
         $extractor = new Extractor();
         $extractor->addChainMember(new SimpleMember());

diff --git a/tests/BetterSerializer/DataBind/Writer/Type/ExtractorBuilderTest.php b/tests/BetterSerializer/DataBind/Writer/Type/ExtractorBuilderTest.php
@@ -10,20 +10,17 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * Class ExtractorBuilderTest
- * @author mfris
- * @package BetterSerializer\DataBind\Writer\Type
+ *
  */
 class ExtractorBuilderTest extends TestCase
 {
 
     /**
-     *
+     * @SuppressWarnings(PHPMD.StaticAccess)
      */
     public function testBuild(): void
     {
-        $builder = new ExtractorBuilder();
-        $extractor = $builder->build();
+        $extractor = ExtractorBuilder::build();
 
         self::assertInstanceOf(ExtractorInterface::class, $extractor);
     }