Lots of small cleanups.

Thanks @jakobsack! Closes #263.
sabre-io · Nov 26, 2015 · 24b48ff · 24b48ff
1 parent ee615b0
commit 24b48ff
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,9 @@ ChangeLog
   because there was something wrong with input data.
 * #227: Always add `VALUE=URI` to `PHOTO` properties.
 * #235: Always add `VALUE=URI` to `URL` properties.
+* It's now possible to override which class is used instead of
+  `Component\VCalendar` or `Component\VCard` during parsing.
+* #263: Lots of small cleanups. (@jakobsack)
 
 
 4.0.0-alpha2 (2015-09-04)

diff --git a/lib/Component/VAlarm.php b/lib/Component/VAlarm.php
@@ -90,7 +90,7 @@ function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end) {
 
         if (isset($this->DURATION)) {
             $duration = VObject\DateTimeParser::parseDuration($this->DURATION);
-            $repeat = (string)$this->repeat;
+            $repeat = (string)$this->REPEAT;
             if (!$repeat) {
                 $repeat = 1;
             }

diff --git a/lib/Component/VCalendar.php b/lib/Component/VCalendar.php
@@ -37,6 +37,7 @@ class VCalendar extends VObject\Document {
      * @var array
      */
     static $componentMap = [
+        'VCALENDAR'     => 'Sabre\\VObject\\Component\\VCalendar',
         'VALARM'        => 'Sabre\\VObject\\Component\\VAlarm',
         'VEVENT'        => 'Sabre\\VObject\\Component\\VEvent',
         'VFREEBUSY'     => 'Sabre\\VObject\\Component\\VFreeBusy',
@@ -509,7 +510,7 @@ function validate($options = 0) {
                     'node'    => $this,
                 ];
             }
-            if (count(array_unique($componentTypes)) === 0) {
+            if (count($componentTypes) === 0) {
                 $warnings[] = [
                     'level'   => 3,
                     'message' => 'A calendar object on a CalDAV server must have at least 1 component (VTODO, VEVENT, VJOURNAL).',

diff --git a/lib/Component/VCard.php b/lib/Component/VCard.php
@@ -33,6 +33,15 @@ class VCard extends VObject\Document {
      */
     private $version = null;
 
+    /**
+     * This is a list of components, and which classes they should map to.
+     *
+     * @var array
+     */
+    static $componentMap = [
+        'VCARD' => 'Sabre\\VObject\\Component\\VCard',
+    ];
+
     /**
      * List of value-types, and which classes they map to.
      *

diff --git a/lib/Parameter.php b/lib/Parameter.php
@@ -137,7 +137,7 @@ static function guessParameterNameByValue($value) {
             case 'DIB' :
             case 'PICT' :
             case 'TIFF' :
-            case 'PDF ':
+            case 'PDF':
             case 'PS' :
             case 'JPEG' :
             case 'MPEG' :

diff --git a/lib/Parser/MimeDir.php b/lib/Parser/MimeDir.php
@@ -113,14 +113,10 @@ protected function parseDocument() {
 
         switch (strtoupper($line)) {
             case 'BEGIN:VCALENDAR' :
-                $class = isset(VCalendar::$componentMap['VCALENDAR'])
-                    ? VCalendar::$componentMap[$name]
-                    : 'Sabre\\VObject\\Component\\VCalendar';
+                $class = VCalendar::$componentMap['VCALENDAR'];
                 break;
             case 'BEGIN:VCARD' :
-                $class = isset(VCard::$componentMap['VCARD'])
-                    ? VCard::$componentMap['VCARD']
-                    : 'Sabre\\VObject\\Component\\VCard';
+                $class = VCard::$componentMap['VCARD'];
                 break;
             default :
                 throw new ParseException('This parser only supports VCARD and VCALENDAR files');

diff --git a/lib/Property.php b/lib/Property.php
@@ -120,7 +120,7 @@ function getValue() {
             } elseif (count($this->value) === 1) {
                 return $this->value[0];
             } else {
-                return $this->getRawMimeDirValue($this->value);
+                return $this->getRawMimeDirValue();
             }
         } else {
             return $this->value;

diff --git a/tests/VObject/PropertyTest.php b/tests/VObject/PropertyTest.php
@@ -287,7 +287,7 @@ function testValidateControlChars() {
         $result = $property->validate(Property::REPAIR);
 
         $this->assertEquals('Property contained a control character (0x7f)', $result[0]['message']);
-        $this->assertEquals("chars[7F()5E(^)5C(\\\\)3B(\\;)3A(:)2C(\\,)22(\")20( )1F()1E()1D()1C()1B()1A()19()18()17()16()15()14()13()12()11()10()0F()0E()0D()0C()0B()0A(\\n)09(	)08()07()06()05()04()03()02()01()00()]end", $property->getRawMimeDirValue());
+        $this->assertEquals("chars[7F()5E(^)5C(\\\\)3B(\\;)3A(:)2C(\\,)22(\")20( )1F()1E()1D()1C()1B()1A()19()18()17()16()15()14()13()12()11()10()0F()0E()0D()0C()0B()0A(\\n)09(\t)08()07()06()05()04()03()02()01()00()]end", $property->getRawMimeDirValue());
 
     }
 

diff --git a/tests/VObject/ReaderTest.php b/tests/VObject/ReaderTest.php
@@ -302,7 +302,7 @@ function testReadPropertyParameterNewLines() {
         $data = "BEGIN:VCALENDAR\r\nPROPNAME;PARAMNAME=paramvalue1^nvalue2^^nvalue3:propValue\r\nEND:VCALENDAR";
         $result = Reader::read($data);
 
-        $result = $result->propname;
+        $result = $result->PROPNAME;
 
         $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
         $this->assertEquals('PROPNAME', $result->name);
@@ -318,7 +318,7 @@ function testReadPropertyParameterQuotedColon() {
 
         $data = "BEGIN:VCALENDAR\r\nPROPNAME;PARAMNAME=\"param:value\":propValue\r\nEND:VCALENDAR";
         $result = Reader::read($data);
-        $result = $result->propname;
+        $result = $result->PROPNAME;
 
         $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
         $this->assertEquals('PROPNAME', $result->name);