Fixed "Cannot access property ::$toStringFormat" when extending Carbo…

…n and type juggling to a string occurs. Added supporting test.

history.md

@@ -1,3 +1,7 @@
+1.6.0 / 2013-11-23
+==================
+* Fixed "Cannot access property ::$toStringFormat" when extending Carbon and type juggling to a string occurs
+
 1.5.0 / 2013-11-21
 ==================
 * Diff for humans now shows 2 weeks ago instead of 14 days ago

src/Carbon/Carbon.php

@@ -63,7 +63,7 @@ class Carbon extends DateTime
    *
    * @var array
    */
-   private static $days = array(
+   protected static $days = array(
       self::SUNDAY    => 'Sunday',
       self::MONDAY    => 'Monday',
       self::TUESDAY   => 'Tuesday',
@@ -78,7 +78,7 @@ class Carbon extends DateTime
     *
     * @var array
     */
-    private static $relativeKeywords = array(
+    protected static $relativeKeywords = array(
       'this',
       'next',
       'last',
@@ -113,7 +113,7 @@ class Carbon extends DateTime
     *
     * @var string
     */
-   private static $toStringFormat = self::DEFAULT_TO_STRING_FORMAT;
+   protected static $toStringFormat = self::DEFAULT_TO_STRING_FORMAT;
 
    /**
     * A test Carbon instance to be returned when now instances are created
@@ -164,17 +164,17 @@ public function __construct($time = null, $tz = null)
       // If the class has a test now set and we are trying to create a now()
       // instance then override as required
       if (static::hasTestNow() && (empty($time) || $time === 'now' || self::hasRelativeKeywords($time))) {
-	 $testInstance = clone static::getTestNow();
-	 if (self::hasRelativeKeywords($time)) {
-	     $testInstance->modify($time);
-	 }
-
-	 //shift the time according to the given time zone
-	 if ($tz !== NULL && $tz != static::getTestNow()->tz) {
-	     $testInstance->setTimezone($tz);
-	 } else {
-	     $tz = $testInstance->tz;
-	 }
+         $testInstance = clone static::getTestNow();
+         if (self::hasRelativeKeywords($time)) {
+   	     $testInstance->modify($time);
+         }
+
+         //shift the time according to the given time zone
+         if ($tz !== NULL && $tz != static::getTestNow()->tz) {
+            $testInstance->setTimezone($tz);
+         } else {
+            $tz = $testInstance->tz;
+         }
 
          $time = $testInstance->toDateTimeString();
       }

tests/StringsTest.php

@@ -11,6 +11,8 @@
 
 use Carbon\Carbon;
 
+class MyCarbon extends Carbon {}
+
 class StringsTest extends TestFixture
 {
    public function testToString()
@@ -31,6 +33,10 @@ public function testResetToStringFormat()
       Carbon::resetToStringFormat();
       $this->assertSame($d->toDateTimeString(), ''.$d);
    }
+   public function testExtendedClassToString() {
+      $d = MyCarbon::now();
+      $this->assertSame($d->toDateTimeString(), ''.$d);
+   }
 
    public function testToDateString()
    {