Use frozen time in tests

jenssegers · Jun 2, 2019 · 4b6a41d · 4b6a41d
1 parent 86e21c5
commit 4b6a41d
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 7 deletions.
diff --git a/.codacy.yml b/.codacy.yml
@@ -0,0 +1,28 @@
+---
+engines:
+  phpmd:
+    enabled: true
+    config:
+      rulesets: "phpmd.xml"
+  rubocop:
+    enabled: true
+  shellcheck:
+    enabled: true
+  stylelint:
+    enabled: true
+  duplication:
+    enabled: true
+  metrics:
+    enabled: true
+  coverage:
+    enabled: true
+  structure:
+    enabled: true
+  sonar-php:
+    enabled: true
+  fixme:
+    enabled: true
+  phpcodesniffer:
+    enabled: true
+exclude_paths:
+  - 'tests/**'
diff --git a/phpmd.xml b/phpmd.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<ruleset name="Mess detection rules for Jenssegers\Date"
+         xmlns="http://pmd.sf.net/ruleset/1.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0
+                     http://pmd.sf.net/ruleset_xml_schema.xsd"
+         xsi:noNamespaceSchemaLocation="
+                     http://pmd.sf.net/ruleset_xml_schema.xsd">
+    <description>
+        Mess detection rules for Jenssegers\Date
+    </description>
+    <rule ref="rulesets/codesize.xml" />
+    <rule ref="rulesets/cleancode.xml" />
+    <rule ref="rulesets/controversial.xml" />
+    <rule ref="rulesets/design.xml" />
+    <rule ref="rulesets/naming.xml/BooleanGetMethodName" />
+    <rule ref="rulesets/naming.xml/ConstructorWithNameAsEnclosingClass" />
+    <rule ref="rulesets/naming.xml/ConstantNamingConventions" />
+    <rule ref="rulesets/naming.xml/LongVariable">
+        <properties>
+            <property name="maximum" value="25" />
+        </properties>
+    </rule>
+    <rule ref="rulesets/naming.xml/ShortVariable" />
+    <rule ref="rulesets/naming.xml/ShortMethodName" />
+    <rule ref="rulesets/unusedcode.xml" />
+</ruleset>
diff --git a/src/Date.php b/src/Date.php
@@ -27,22 +27,22 @@ class Date extends Carbon
      */
     protected static $parseFunction = 'parseWithCurrentLocale';
 
-    public static function parseWithCurrentLocale($time = null, $tz = null)
+    public static function parseWithCurrentLocale($time = null, $timezone = null)
     {
         if (is_string($time)) {
             $time = static::translateTimeString($time, static::getLocale(), 'en');
         }
 
-        return parent::rawParse($time, $tz);
+        return parent::rawParse($time, $timezone);
     }
 
-    public static function createFromFormatWithCurrentLocale($format, $time = null, $tz = null)
+    public static function createFromFormatWithCurrentLocale($format, $time = null, $timezone = null)
     {
         if (is_string($time)) {
             $time = static::translateTimeString($time, static::getLocale(), 'en');
         }
 
-        return parent::rawCreateFromFormat($format, $time, $tz);
+        return parent::rawCreateFromFormat($format, $time, $timezone);
     }
 
     /**

diff --git a/tests/DateTest.php b/tests/DateTest.php
@@ -25,20 +25,20 @@ public function testConstructFromString()
         $this->assertSame(1359590400, $date->getTimestamp());
 
         $date = new Date('1 day ago');
-        $this->assertSame(time() - 86400, $date->getTimestamp());
+        $this->assertSame($this->time - 86400, $date->getTimestamp());
     }
 
     public function testConstructWithTimezone()
     {
         $date = new Date('now', 'Europe/Paris');
         date_default_timezone_set('Europe/Paris');
-        $this->assertSame(time(), $date->getTimestamp());
+        $this->assertSame($this->time, $date->getTimestamp());
 
         date_default_timezone_set('Europe/Brussels');
 
         $date = new Date(null, 'Europe/Paris');
         date_default_timezone_set('Europe/Paris');
-        $this->assertSame(time(), $date->getTimestamp());
+        $this->assertSame($this->time, $date->getTimestamp());
     }
 
     public function testConstructTimestamp()