Merge pull request #487 from webparking/phpstan-level-1

Fixed phpstan level 1 errors
sabre-io · Jan 30, 2020 · db2eee8 · db2eee8
2 parents 458bf94 + 36d00ee
commit db2eee8
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 21 deletions.
diff --git a/lib/Property/ICalendar/DateTime.php b/lib/Property/ICalendar/DateTime.php
@@ -338,8 +338,8 @@ public function validate($options = 0)
         $messages = parent::validate($options);
         $valueType = $this->getValueType();
         $values = $this->getParts();
-        try {
-            foreach ($values as $value) {
+        foreach ($values as $value) {
+            try {
                 switch ($valueType) {
                     case 'DATE':
                         DateTimeParser::parseDate($value);
@@ -348,13 +348,14 @@ public function validate($options = 0)
                         DateTimeParser::parseDateTime($value);
                         break;
                 }
+            } catch (InvalidDataException $e) {
+                $messages[] = [
+                    'level' => 3,
+                    'message' => 'The supplied value ('.$value.') is not a correct '.$valueType,
+                    'node' => $this,
+                ];
+                break;
             }
-        } catch (InvalidDataException $e) {
-            $messages[] = [
-                'level' => 3,
-                'message' => 'The supplied value ('.$value.') is not a correct '.$valueType,
-                'node' => $this,
-            ];
         }
 
         return $messages;

diff --git a/lib/Recur/RRuleIterator.php b/lib/Recur/RRuleIterator.php
@@ -322,14 +322,17 @@ protected function nextDaily()
             return;
         }
 
+        $recurrenceHours = [];
         if (!empty($this->byHour)) {
             $recurrenceHours = $this->getHours();
         }
 
+        $recurrenceDays = [];
         if (!empty($this->byDay)) {
             $recurrenceDays = $this->getDays();
         }
 
+        $recurrenceMonths = [];
         if (!empty($this->byMonth)) {
             $recurrenceMonths = $this->getMonths();
         }
@@ -372,10 +375,12 @@ protected function nextWeekly()
             return;
         }
 
+        $recurrenceHours = [];
         if ($this->byHour) {
             $recurrenceHours = $this->getHours();
         }
 
+        $recurrenceDays = [];
         if ($this->byDay) {
             $recurrenceDays = $this->getDays();
         }
@@ -436,6 +441,7 @@ protected function nextMonthly()
             return;
         }
 
+        $occurrence = -1;
         while (true) {
             $occurrences = $this->getMonthlyOccurrences();
 
@@ -605,6 +611,7 @@ protected function nextYearly()
         // If we got a byDay or getMonthDay filter, we must first expand
         // further.
         if ($this->byDay || $this->byMonthDay) {
+            $occurrence = -1;
             while (true) {
                 $occurrences = $this->getMonthlyOccurrences();
 

diff --git a/phpstan.neon b/phpstan.neon
@@ -1,2 +1,4 @@
 parameters:
-  level: 0
+  level: 1
+  universalObjectCratesClasses:
+    - \Sabre\VObject\Component
diff --git a/tests/VObject/CliTest.php b/tests/VObject/CliTest.php
@@ -14,8 +14,14 @@ class CliTest extends TestCase
     /** @var CliMock */
     private $cli;
 
+    private $sabreTempDir = __DIR__.'/../temp/';
+
     public function setUp(): void
     {
+        if (!file_exists($this->sabreTempDir)) {
+            mkdir($this->sabreTempDir);
+        }
+
         $this->cli = new CliMock();
         $this->cli->stderr = fopen('php://memory', 'r+');
         $this->cli->stdout = fopen('php://memory', 'r+');
@@ -269,7 +275,7 @@ public function testConvertMimeDir()
 
     public function testConvertDefaultFormats()
     {
-        $outputFile = SABRE_TEMPDIR.'bar.json';
+        $outputFile = $this->sabreTempDir.'bar.json';
 
         $this->assertEquals(
             2,
@@ -282,7 +288,7 @@ public function testConvertDefaultFormats()
 
     public function testConvertDefaultFormats2()
     {
-        $outputFile = SABRE_TEMPDIR.'bar.ics';
+        $outputFile = $this->sabreTempDir.'bar.ics';
 
         $this->assertEquals(
             2,

diff --git a/tests/VObject/ComponentTest.php b/tests/VObject/ComponentTest.php
@@ -22,9 +22,12 @@ public function testIterate()
         foreach ($comp->children() as $key => $subcomponent) {
             ++$count;
             $this->assertInstanceOf('Sabre\\VObject\\Component', $subcomponent);
+
+            if (2 === $count) {
+                $this->assertEquals(1, $key);
+            }
         }
         $this->assertEquals(2, $count);
-        $this->assertEquals(1, $key);
     }
 
     public function testMagicGet()

diff --git a/tests/VObject/ElementListTest.php b/tests/VObject/ElementListTest.php
@@ -23,8 +23,11 @@ public function testIterate()
         foreach ($elemList as $key => $subcomponent) {
             ++$count;
             $this->assertInstanceOf('Sabre\\VObject\\Component', $subcomponent);
+
+            if (3 === $count) {
+                $this->assertEquals(2, $key);
+            }
         }
         $this->assertEquals(3, $count);
-        $this->assertEquals(2, $key);
     }
 }
diff --git a/tests/VObject/ITip/BrokerTester.php b/tests/VObject/ITip/BrokerTester.php
@@ -45,6 +45,7 @@ public function process($input, $existingObject = null, $expected = false)
 
         $vcal = Reader::read($input);
 
+        $mainComponent = new \Sabre\VObject\Component\VEvent($vcal, 'VEVENT');
         foreach ($vcal->getComponents() as $mainComponent) {
             if ('VEVENT' === $mainComponent->name) {
                 break;

diff --git a/tests/VObject/Recur/EventIterator/ByMonthInDailyTest.php b/tests/VObject/Recur/EventIterator/ByMonthInDailyTest.php
@@ -40,6 +40,7 @@ public function testExpand()
 
         $vcal = $vcal->expand(new DateTime('2013-09-28'), new DateTime('2014-09-11'));
 
+        $dates = [];
         foreach ($vcal->VEVENT as $event) {
             $dates[] = $event->DTSTART->getValue();
         }

diff --git a/tests/VObject/Recur/EventIterator/BySetPosHangTest.php b/tests/VObject/Recur/EventIterator/BySetPosHangTest.php
@@ -35,6 +35,7 @@ public function testExpand()
 
         $vcal = $vcal->expand(new DateTime('2015-01-01'), new DateTime('2016-01-01'));
 
+        $dates = [];
         foreach ($vcal->VEVENT as $event) {
             $dates[] = $event->DTSTART->getValue();
         }

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -13,11 +13,3 @@
         break;
     }
 }
-
-if (!defined('SABRE_TEMPDIR')) {
-    define('SABRE_TEMPDIR', __DIR__.'/temp/');
-}
-
-if (!file_exists(SABRE_TEMPDIR)) {
-    mkdir(SABRE_TEMPDIR);
-}