Merge pull request #11 from ingenerator/namespace-global-functions

Run php-cs-fixer native_function_invocation fix

Author: craig410

.travis.yml

@@ -1,9 +1,6 @@
 sudo: false
 language: php
 php:
- - '5.5'
- - '5.6'
- - '7.1'
  - '7.2'
 
 # Only build main branches : feature branches will be covered by the PR builder

CHANGELOG.md

@@ -1,5 +1,10 @@
 ### Unreleased
 
+### v0.2.0 (2019-04-02)
+
+* Drop support for php < 7.2
+* Run test suite against php 7.2
+
 ### v0.1.6 (2019-03-18)
 
 * Update StoppedMockClock to support newer phpunit (use namespaced assert class) and add

composer.json

@@ -15,11 +15,11 @@
     }
   ],
   "require": {
-    "php": "^5.5||^7.0"
+    "php": "^7.2"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.8||^6.5",
-    "johnkary/phpunit-speedtrap": "^1.0||^2.0"
+    "phpunit/phpunit": "^6.5",
+    "johnkary/phpunit-speedtrap": "^2.0"
   },
   "support": {
     "source": "https://github.com/ingenerator/php-utils",

src/CSV/CSVWriter.php

@@ -41,19 +41,19 @@ class CSVWriter
      */
     public function open($file, array $options = [])
     {
-        if (is_resource($file) AND (get_resource_type($file) === 'stream')) {
+        if (\is_resource($file) AND (\get_resource_type($file) === 'stream')) {
             $this->resource      = $file;
             $this->owns_resource = FALSE;
-        } elseif (is_string($file)) {
-            $this->resource      = fopen($file, 'w');
+        } elseif (\is_string($file)) {
+            $this->resource      = \fopen($file, 'w');
             $this->owns_resource = TRUE;
         } else {
             throw new \InvalidArgumentException(
                 'Expected `file` to be string or an existing resource'
             );
         }
         $this->expect_schema = NULL;
-        $this->options       = array_merge($this->options, $options);
+        $this->options       = \array_merge($this->options, $options);
     }
 
     /**
@@ -65,24 +65,24 @@ public function write(array $row)
             throw new \LogicException('Cannot write to a closed file');
         }
 
-        $row_schema = array_keys($row);
+        $row_schema = \array_keys($row);
 
         if ($this->expect_schema === NULL) {
             if ($this->options['write_utf8_bom']) {
-                fputs($this->resource, static::UTF8_BOM);
+                \fputs($this->resource, static::UTF8_BOM);
             }
             $this->expect_schema = $row_schema;
-            fputcsv($this->resource, $this->expect_schema);
+            \fputcsv($this->resource, $this->expect_schema);
         } elseif ($this->expect_schema !== $row_schema) {
             throw MismatchedSchemaException::forSchema($this->expect_schema, $row_schema);
         }
 
-        fputcsv($this->resource, $row);
+        \fputcsv($this->resource, $row);
     }
 
     protected function isResourceOpen()
     {
-        return $this->resource && (get_resource_type($this->resource) === 'stream');
+        return $this->resource && (\get_resource_type($this->resource) === 'stream');
     }
 
     public function close()
@@ -92,7 +92,7 @@ public function close()
         }
 
         if ($this->owns_resource) {
-            fclose($this->resource);
+            \fclose($this->resource);
         }
 
         $this->resource = NULL;

src/CSV/MismatchedSchemaException.php

@@ -14,8 +14,8 @@ public static function forSchema(array $expected, array $actual)
     {
         return new static(
             'Mismatched row schema in CSV file:'."\n"
-            .'Expected: '.json_encode($expected)."\n"
-            .'Actual:   '.json_encode($actual)
+            .'Expected: '.\json_encode($expected)."\n"
+            .'Actual:   '.\json_encode($actual)
         );
     }
 

src/DateTime/Clock/RealtimeClock.php

@@ -28,14 +28,14 @@ public function getDateTime()
      */
     public function getMicrotime()
     {
-        return microtime(TRUE);
+        return \microtime(TRUE);
     }
 
     /**
      * @param $microseconds
      */
     public function usleep($microseconds)
     {
-        usleep($microseconds);
+        \usleep($microseconds);
     }
 }

src/DateTime/Clock/StoppedMockClock.php

@@ -79,7 +79,7 @@ public static function atTimeAgo($interval_spec)
 
     public function getDateTime()
     {
-        return (new \DateTimeImmutable)->setTimestamp(floor($this->current_microtime));
+        return (new \DateTimeImmutable)->setTimestamp(\floor($this->current_microtime));
     }
 
     public function getMicrotime()

src/Object/ConstantDirectory.php

@@ -44,10 +44,10 @@ public static function forClass($class)
      */
     public function filterConstants($prefix)
     {
-        $prefix_len = strlen($prefix);
+        $prefix_len = \strlen($prefix);
         $consts     = [];
         foreach ($this->listConstants() as $name => $value) {
-            if (strncmp($name, $prefix, $prefix_len) === 0) {
+            if (\strncmp($name, $prefix, $prefix_len) === 0) {
                 $consts[$name] = $value;
             }
         }

src/Object/ObjectPropertyPopulator.php

@@ -35,9 +35,9 @@ public static function assign($object, $property, $value)
      */
     public static function assignHash($object, array $properties)
     {
-        if ($undefined = static::listUndefinedProperties($object, array_keys($properties))) {
+        if ($undefined = static::listUndefinedProperties($object, \array_keys($properties))) {
             throw new \InvalidArgumentException(
-                'Undefined properties on '.get_class($object).' : '.json_encode($undefined)
+                'Undefined properties on '.\get_class($object).' : '.\json_encode($undefined)
             );
         }
 
@@ -58,11 +58,11 @@ function ($object, array $properties) {
 
     private static function listUndefinedProperties($object, array $property_names)
     {
-        return array_values(
-            array_filter(
+        return \array_values(
+            \array_filter(
                 $property_names,
                 function ($property_name) use ($object) {
-                    return ! property_exists($object, $property_name);
+                    return ! \property_exists($object, $property_name);
                 }
             )
         );

src/Object/ObjectPropertyRipper.php

@@ -28,7 +28,7 @@ class ObjectPropertyRipper
      */
     public static function rip($object, array $properties)
     {
-        $ripper = static::getRipper(get_class($object));
+        $ripper = static::getRipper(\get_class($object));
 
         return $ripper($object, $properties);
     }