Merge pull request #3 from SpacePossum/SpacePossum-patch-1

Prepare for release 1.0

Author: SpacePossum

.travis.yml

@@ -8,31 +8,28 @@ sudo: false
 matrix:
     fast_finish: true
     include:
-        - php: 5.6
-          env: COMPOSER_FLAGS="--prefer-stable"
         - php: 7.0
           env: COMPOSER_FLAGS="--prefer-stable"
         - php: 7.1
           env: COMPOSER_FLAGS="--dev"
-        - php: hhvm-3.12
-          sudo: required
-          dist: trusty
-          group: edge
-          env: COMPOSER_FLAGS="--prefer-stable"
-        - php: hhvm-nightly
-          sudo: required
-          dist: trusty
-          group: edge
+        - php: nightly
           env: COMPOSER_FLAGS="--dev"
     allow_failures:
-        - php: hhvm-nightly
+        - php: nightly
+
+services:
+    - mongodb
+
+before_install:
+    - INI_FILE=$(echo "<?php echo get_cfg_var('cfg_file_path');"|php);
+    - echo $INI_FILE;
+    - echo extension=mongodb.so >> $INI_FILE;
 
 install:
     - composer update $COMPOSER_FLAGS --no-interaction -v
     - if [[ $TRAVIS_PHP_VERSION = 7.0 ]]; then curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v1.12.1/php-cs-fixer.phar -o php-cs-fixer.phar; fi
 
 script:
-    - composer show twig/twig
     - phpunit --verbose
     - phpenv config-rm xdebug.ini || return 0
-    - if [[ $TRAVIS_PHP_VERSION = 7.0 ]]; then php php-cs-fixer.phar --dry-run -vvv fix; fi
+    - if [[ $TRAVIS_PHP_VERSION = 7.0 ]]; then php php-cs-fixer.phar --dry-run --diff -vvv fix; fi

README.md

@@ -10,7 +10,7 @@ The iterator can return the values it reads from the file by converting those in
 
 ### Requirements
 
-PHP 5.6 (PHP 7 supported). Optional HHVM support >= 3.12.
+PHP 7
 This package is framework agnostic.
 
 ### Install

composer.json

@@ -6,7 +6,7 @@
     "license": "MIT",
     "keywords": ["BSON", "Iterator"],
     "require": {
-        "php": "^5.6.0 || >=7.0 <7.2",
+        "php": ">=7.0 <7.3",
         "mongodb/mongodb": "^1.0.0"
     },
     "require-dev": {

src/Bson/BsonFileIterator.php

@@ -9,6 +9,8 @@
  * with this source code in the file LICENSE.
  */
 
+declare(strict_types=1);
+
 namespace GeckoPackages\Bson;
 
 /**
@@ -64,14 +66,14 @@ final class BsonFileIterator implements \Iterator
      */
     public function __construct(
         $file,
-        $constructType = 1,
-        $maxUnpackSize = 5242880, // 5*1024*1024 bytes
-        $jsonDecodeMaxDepth = 512,
-        $jsonDecodeOptions = 0
+        int $constructType = 1,
+        int $maxUnpackSize = 5242880, // 5*1024*1024 bytes
+        int $jsonDecodeMaxDepth = 512,
+        int $jsonDecodeOptions = 0
     ) {
         $this->resolveFileHandle($file);
         $this->resolveDecoder($constructType, $jsonDecodeMaxDepth, $jsonDecodeOptions);
-        $this->resolveMaxUnpackSize($maxUnpackSize, $file);
+        $this->resolveMaxUnpackSize($maxUnpackSize, $file instanceof \SplFileInfo ? $file->getPathname() : $file);
     }
 
     public function __destruct()
@@ -183,16 +185,8 @@ private function resolveFileHandle($file)
         $this->fileHandle = $fileHandle;
     }
 
-    private function resolveDecoder($constructType, $jsonDecodeMaxDepth, $jsonDecodeOptions)
+    private function resolveDecoder(int $constructType, int $jsonDecodeMaxDepth, int $jsonDecodeOptions)
     {
-        if (!is_int($constructType)) {
-            throw new \InvalidArgumentException(sprintf(
-                'Construct type must be any of integers "%s" got "%s".',
-                implode(', ', [self::CONSTRUCT_JSON, self::CONSTRUCT_ARRAY, self::CONSTRUCT_STD]),
-                is_object($constructType) ? get_class($constructType) : gettype($constructType).(is_resource($constructType) ? '' : '#'.$constructType)
-            ));
-        }
-
         switch ($constructType) {
             case self::CONSTRUCT_JSON:
                 $this->decoder = function ($key, $content) {
@@ -215,20 +209,13 @@ private function resolveDecoder($constructType, $jsonDecodeMaxDepth, $jsonDecode
                 ));
         }
 
-        if (!is_int($jsonDecodeMaxDepth) || $jsonDecodeMaxDepth < 1) {
+        if ($jsonDecodeMaxDepth < 1) {
             throw new \InvalidArgumentException(sprintf(
                 'Expected integer > 0 for JSON decode max depth, got "%s".',
                 is_object($jsonDecodeMaxDepth) ? get_class($jsonDecodeMaxDepth) : gettype($jsonDecodeMaxDepth).(is_resource($jsonDecodeMaxDepth) ? '' : '#'.$jsonDecodeMaxDepth)
             ));
         }
 
-        if (!is_int($jsonDecodeOptions)) {
-            throw new \InvalidArgumentException(sprintf(
-                'Expected integer for JSON decode options, got "%s".',
-                is_object($jsonDecodeOptions) ? get_class($jsonDecodeOptions) : gettype($jsonDecodeOptions).(is_resource($jsonDecodeOptions) ? '' : '#'.$jsonDecodeOptions)
-            ));
-        }
-
         $this->decoder = function ($key, $content) use ($assoc, $jsonDecodeMaxDepth, $jsonDecodeOptions) {
             $content = @json_decode($content, $assoc, $jsonDecodeMaxDepth, $jsonDecodeOptions);
             if (null === $content) {
@@ -245,9 +232,9 @@ private function resolveDecoder($constructType, $jsonDecodeMaxDepth, $jsonDecode
      *
      * @throws \InvalidArgumentException
      */
-    private function resolveMaxUnpackSize($maxUnpackSize, $file)
+    private function resolveMaxUnpackSize(int $maxUnpackSize, string $file)
     {
-        if (!is_int($maxUnpackSize) || $maxUnpackSize <= 0) {
+        if ($maxUnpackSize <= 0) {
             throw new \InvalidArgumentException(sprintf(
                 'Expected integer > 0 for max. unpack size, got "%s".',
                 is_object($maxUnpackSize) ? get_class($maxUnpackSize) : gettype($maxUnpackSize).(is_resource($maxUnpackSize) ? '' : '#'.$maxUnpackSize)

tests/Bson/BsonFileIteratorTest.php

@@ -191,15 +191,6 @@ public function testIteratorFileEmpty()
         $this->assertCount(0, $iterator);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessageRegExp #^Construct type must be any of integers \"1, 2, 3\" got \"stdClass\".$#
-     */
-    public function testIteratorInvalidConstructionOtherType()
-    {
-        new BsonFileIterator($this->getAssetDir().'test.bson', new \stdClass());
-    }
-
     /**
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessageRegExp #^Construct type must be any of integers \"1, 2, 3\" got \"777\".$#
@@ -209,15 +200,6 @@ public function testIteratorInvalidConstructionValueInt()
         new BsonFileIterator($this->getAssetDir().'test.bson', 777);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessageRegExp #^Construct type must be any of integers \"1, 2, 3\" got \"NULL\#\".$#
-     */
-    public function testIteratorInvalidConstructionValueNull()
-    {
-        new BsonFileIterator($this->getAssetDir().'test.bson', null);
-    }
-
     /**
      * @expectedException \UnexpectedValueException
      * @expectedExceptionMessageRegExp #^Invalid data at item \#1, size 12435439 exceeds max. unpack size 372.$#
@@ -279,21 +261,6 @@ public function testIteratorInvalidJsonDecodeMaxDepthValue()
         );
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessageRegExp #^Expected integer for JSON decode options, got \"stdClass\".$#
-     */
-    public function testIteratorInvalidJsonDecodeOptionsType()
-    {
-        new BsonFileIterator(
-            $this->getAssetDir().'empty.bson',
-            BsonFileIterator::CONSTRUCT_ARRAY,
-            5242880,
-            10,
-            new \stdClass()
-        );
-    }
-
     /**
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessageRegExp #^Expected integer > 0 for max. unpack size, got \"integer\#-1\".$#