FriendsOfPear / Calendar

src/Week.php

Switch Indentation +58 added lines, -58 removed lines

@@ -346,22 +346,22 @@ 
     function prevWeek($format = 'n_in_month')
     {
         switch (strtolower($format)) {
-        case 'int':
-        case 'n_in_month':
-            return ($this->firstWeek) ? null : $this->thisWeek('n_in_month') -1;
-        case 'n_in_year':
-            return $this->cE->getWeekNInYear(
-                $this->cE->stampToYear($this->prevWeek),
-                $this->cE->stampToMonth($this->prevWeek),
-                $this->cE->stampToDay($this->prevWeek));
-        case 'array':
-            return $this->toArray($this->prevWeek);
-        case 'object':
-            include_once CALENDAR_ROOT.'Factory.php';
-            return Factory::createByTimestamp('Week', $this->prevWeek);
-        case 'timestamp':
-        default:
-            return $this->prevWeek;
+            case 'int':
+            case 'n_in_month':
+                return ($this->firstWeek) ? null : $this->thisWeek('n_in_month') -1;
+            case 'n_in_year':
+                return $this->cE->getWeekNInYear(
+                    $this->cE->stampToYear($this->prevWeek),
+                    $this->cE->stampToMonth($this->prevWeek),
+                    $this->cE->stampToDay($this->prevWeek));
+            case 'array':
+                return $this->toArray($this->prevWeek);
+            case 'object':
+                include_once CALENDAR_ROOT.'Factory.php';
+                return Factory::createByTimestamp('Week', $this->prevWeek);
+            case 'timestamp':
+            default:
+                return $this->prevWeek;
         }
     }
 
@@ -376,35 +376,35 @@ 
     function thisWeek($format = 'n_in_month')
     {
         switch (strtolower($format)) {
-        case 'int':
-        case 'n_in_month':
-            if ($this->firstWeek) {
-                return 1;
-            }
-            if ($this->lastWeek) {
-                return $this->cE->getWeeksInMonth(
+            case 'int':
+            case 'n_in_month':
+                if ($this->firstWeek) {
+                    return 1;
+                }
+                if ($this->lastWeek) {
+                    return $this->cE->getWeeksInMonth(
+                        $this->thisYear(),
+                        $this->thisMonth(),
+                        $this->firstDay);
+                }
+                return $this->cE->getWeekNInMonth(
                     $this->thisYear(),
                     $this->thisMonth(),
+                    $this->thisDay(),
                     $this->firstDay);
-            }
-            return $this->cE->getWeekNInMonth(
-                $this->thisYear(),
-                $this->thisMonth(),
-                $this->thisDay(),
-                $this->firstDay);
-        case 'n_in_year':
-            return $this->cE->getWeekNInYear(
-                $this->cE->stampToYear($this->thisWeek),
-                $this->cE->stampToMonth($this->thisWeek),
-                $this->cE->stampToDay($this->thisWeek));
-        case 'array':
-            return $this->toArray($this->thisWeek);
-        case 'object':
-            include_once CALENDAR_ROOT.'Factory.php';
-            return Factory::createByTimestamp('Week', $this->thisWeek);
-        case 'timestamp':
-        default:
-            return $this->thisWeek;
+            case 'n_in_year':
+                return $this->cE->getWeekNInYear(
+                    $this->cE->stampToYear($this->thisWeek),
+                    $this->cE->stampToMonth($this->thisWeek),
+                    $this->cE->stampToDay($this->thisWeek));
+            case 'array':
+                return $this->toArray($this->thisWeek);
+            case 'object':
+                include_once CALENDAR_ROOT.'Factory.php';
+                return Factory::createByTimestamp('Week', $this->thisWeek);
+            case 'timestamp':
+            default:
+                return $this->thisWeek;
         }
     }
 
@@ -419,22 +419,22 @@ 
     function nextWeek($format = 'n_in_month')
     {
         switch (strtolower($format)) {
-        case 'int':
-        case 'n_in_month':
-            return ($this->lastWeek) ? null : $this->thisWeek('n_in_month') +1;
-        case 'n_in_year':
-            return $this->cE->getWeekNInYear(
-                $this->cE->stampToYear($this->nextWeek),
-                $this->cE->stampToMonth($this->nextWeek),
-                $this->cE->stampToDay($this->nextWeek));
-        case 'array':
-            return $this->toArray($this->nextWeek);
-        case 'object':
-            include_once CALENDAR_ROOT.'Factory.php';
-            return Factory::createByTimestamp('Week', $this->nextWeek);
-        case 'timestamp':
-        default:
-            return $this->nextWeek;
+            case 'int':
+            case 'n_in_month':
+                return ($this->lastWeek) ? null : $this->thisWeek('n_in_month') +1;
+            case 'n_in_year':
+                return $this->cE->getWeekNInYear(
+                    $this->cE->stampToYear($this->nextWeek),
+                    $this->cE->stampToMonth($this->nextWeek),
+                    $this->cE->stampToDay($this->nextWeek));
+            case 'array':
+                return $this->toArray($this->nextWeek);
+            case 'object':
+                include_once CALENDAR_ROOT.'Factory.php';
+                return Factory::createByTimestamp('Week', $this->nextWeek);
+            case 'timestamp':
+            default:
+                return $this->nextWeek;
         }
     }
 

Spacing +5 added lines, -5 removed lines

@@ -223,7 +223,7 @@ 
             $this->thisDay()
         );
 
-        for ($i=1; $i <= $end; $i++) {
+        for ($i = 1; $i <= $end; $i++) {
             $stamp = $this->cE->dateToStamp($year, $month, $day++);
             $this->children[$i] = new Day(
                 $this->cE->stampToYear($stamp),
@@ -235,13 +235,13 @@ 
         //set empty days (@see Calendar_Month_Weeks::build())
         if ($this->firstWeek) {
             $eBefore = $this->tableHelper->getEmptyDaysBefore();
-            for ($i=1; $i <= $eBefore; $i++) {
+            for ($i = 1; $i <= $eBefore; $i++) {
                 $this->children[$i]->setEmpty();
             }
         }
         if ($this->lastWeek) {
             $eAfter = $this->tableHelper->getEmptyDaysAfterOffset();
-            for ($i = $eAfter+1; $i <= $end; $i++) {
+            for ($i = $eAfter + 1; $i <= $end; $i++) {
                 $this->children[$i]->setEmpty();
             }
         }
@@ -348,7 +348,7 @@ 
         switch (strtolower($format)) {
         case 'int':
         case 'n_in_month':
-            return ($this->firstWeek) ? null : $this->thisWeek('n_in_month') -1;
+            return ($this->firstWeek) ? null : $this->thisWeek('n_in_month') - 1;
         case 'n_in_year':
             return $this->cE->getWeekNInYear(
                 $this->cE->stampToYear($this->prevWeek),
@@ -421,7 +421,7 @@ 
         switch (strtolower($format)) {
         case 'int':
         case 'n_in_month':
-            return ($this->lastWeek) ? null : $this->thisWeek('n_in_month') +1;
+            return ($this->lastWeek) ? null : $this->thisWeek('n_in_month') + 1;
         case 'n_in_year':
             return $this->cE->getWeekNInYear(
                 $this->cE->stampToYear($this->nextWeek),

src/Hour.php

Indentation +2 added lines, -2 removed lines

@@ -98,11 +98,11 @@
     {
         include_once CALENDAR_ROOT.'Minute.php';
         $mIH = $this->cE->getMinutesInHour($this->year, $this->month, $this->day,
-                           $this->hour);
+                            $this->hour);
         for ($i=0; $i < $mIH; $i++) {
             $this->children[$i] =
                 new Minute($this->year, $this->month, $this->day,
-                           $this->hour, $i);
+                            $this->hour, $i);
         }
         if (count($sDates) > 0) {
             $this->setSelection($sDates);

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
         include_once CALENDAR_ROOT.'Minute.php';
         $mIH = $this->cE->getMinutesInHour($this->year, $this->month, $this->day,
                            $this->hour);
-        for ($i=0; $i < $mIH; $i++) {
+        for ($i = 0; $i < $mIH; $i++) {
             $this->children[$i] =
                 new Minute($this->year, $this->month, $this->day,
                            $this->hour, $i);

src/Engine/UnixTS.php

Spacing +12 added lines, -12 removed lines

@@ -77,7 +77,7 @@ 
     function stampCollection($stamp)
     {
         static $stamps = array();
-        if ( !isset($stamps[$stamp]) ) {
+        if (!isset($stamps[$stamp])) {
             $date = @date('Y n j H i s t W w', $stamp);
             $stamps[$stamp] = sscanf($date, "%d %d %d %d %d %d %d %d %d");
         }
@@ -181,7 +181,7 @@ 
      * @return int Unix timestamp
      * @access protected
      */
-    function dateToStamp($y, $m, $d, $h=0, $i=0, $s=0)
+    function dateToStamp($y, $m, $d, $h = 0, $i = 0, $s = 0)
     {
         static $dates = array();
         if (!isset($dates[$y][$m][$d][$h][$i][$s])) {
@@ -220,7 +220,7 @@ 
      * @return int (12)
      * @access protected
      */
-    function getMonthsInYear($y=null)
+    function getMonthsInYear($y = null)
     {
         return 12;
     }
@@ -268,7 +268,7 @@ 
      * @return int (7)
      * @access protected
      */
-    function getDaysInWeek($y=null, $m=null, $d=null)
+    function getDaysInWeek($y = null, $m = null, $d = null)
     {
         return 7;
     }
@@ -301,9 +301,9 @@ 
      * @return int week number
      * @access protected
      */
-    function getWeekNInMonth($y, $m, $d, $firstDay=1)
+    function getWeekNInMonth($y, $m, $d, $firstDay = 1)
     {
-        $weekEnd = (0 == $firstDay) ? $this->getDaysInWeek()-1 : $firstDay-1;
+        $weekEnd = (0 == $firstDay) ? $this->getDaysInWeek() - 1 : $firstDay - 1;
         $end_of_week = 1;
         while (@date('w', @mktime(0, 0, 0, $m, $end_of_week, $y)) != $weekEnd) {
             ++$end_of_week; //find first weekend of the month
@@ -371,7 +371,7 @@ 
      * @return array (0,1,2,3,4,5,6) 1 = Monday
      * @access protected
      */
-    function getWeekDays($y=null, $m=null, $d=null)
+    function getWeekDays($y = null, $m = null, $d = null)
     {
         return array(0, 1, 2, 3, 4, 5, 6);
     }
@@ -386,7 +386,7 @@ 
      * @return int (default 1 = Monday)
      * @access protected
      */
-    function getFirstDayOfWeek($y=null, $m=null, $d=null)
+    function getFirstDayOfWeek($y = null, $m = null, $d = null)
     {
         return 1;
     }
@@ -401,7 +401,7 @@ 
      * @return int (24)
      * @access protected
      */
-    function getHoursInDay($y=null, $m=null, $d=null)
+    function getHoursInDay($y = null, $m = null, $d = null)
     {
         return 24;
     }
@@ -417,7 +417,7 @@ 
      * @return int (60)
      * @access protected
      */
-    function getMinutesInHour($y=null, $m=null, $d=null, $h=null)
+    function getMinutesInHour($y = null, $m = null, $d = null, $h = null)
     {
         return 60;
     }
@@ -434,7 +434,7 @@ 
      * @return int (60)
      * @access protected
      */
-    function getSecondsInMinute($y=null, $m=null, $d=null, $h=null, $i=null)
+    function getSecondsInMinute($y = null, $m = null, $d = null, $h = null, $i = null)
     {
         return 60;
     }
@@ -455,7 +455,7 @@ 
             $today = sscanf($today_date, '%d %d %d');
         }
         $date = UnixTS::stampCollection($stamp);
-        return (   $date[2] == $today[2]
+        return ($date[2] == $today[2]
                 && $date[1] == $today[1]
                 && $date[0] == $today[0]
         );

src/Engine/PearDate.php

Spacing +15 added lines, -15 removed lines

@@ -167,7 +167,7 @@ 
      * @return string iso-8601 datetime
      * @access protected
      */
-    function dateToStamp($y, $m, $d, $h=0, $i=0, $s=0)
+    function dateToStamp($y, $m, $d, $h = 0, $i = 0, $s = 0)
     {
         $r = array();
         PearDate::adjustDate($y, $m, $d, $h, $i, $s);
@@ -218,8 +218,8 @@ 
             $d += floor($h / 24);
             $h %= 24;
         }
-        for(; $m < 1; $y--, $m+=12);
-        for(; $m > 12; $y++, $m-=12);
+        for (; $m < 1; $y--, $m += 12);
+        for (; $m > 12; $y++, $m -= 12);
 
         while ($d < 1) {
             if ($m > 1) {
@@ -230,7 +230,7 @@ 
             }
             $d += Date_Calc::daysInMonth($m, $y);
         }
-        for ($max_days = Date_Calc::daysInMonth($m, $y); $d > $max_days; ) {
+        for ($max_days = Date_Calc::daysInMonth($m, $y); $d > $max_days;) {
             $d -= $max_days;
             if ($m < 12) {
                 $m++;
@@ -271,7 +271,7 @@ 
      * @return int (12)
      * @access protected
      */
-    function getMonthsInYear($y=null)
+    function getMonthsInYear($y = null)
     {
         return 12;
     }
@@ -315,7 +315,7 @@ 
      * @return int (7)
      * @access protected
      */
-    function getDaysInWeek($y=null, $m=null, $d=null)
+    function getDaysInWeek($y = null, $m = null, $d = null)
     {
         return 7;
     }
@@ -348,9 +348,9 @@ 
      * @return int week number
      * @access protected
      */
-    function getWeekNInMonth($y, $m, $d, $firstDay=1)
+    function getWeekNInMonth($y, $m, $d, $firstDay = 1)
     {
-        $weekEnd = ($firstDay == 0) ? $this->getDaysInWeek()-1 : $firstDay-1;
+        $weekEnd = ($firstDay == 0) ? $this->getDaysInWeek() - 1 : $firstDay - 1;
         $end_of_week = (int)Date_Calc::nextDayOfWeek($weekEnd, 1, $m, $y, '%e', true);
         $w = 1;
         while ($d > $end_of_week) {
@@ -370,7 +370,7 @@ 
      * @return int weeks number
      * @access protected
      */
-    function getWeeksInMonth($y, $m, $firstDay=1)
+    function getWeeksInMonth($y, $m, $firstDay = 1)
     {
         $FDOM = Date_Calc::firstOfMonthWeekday($m, $y);
         if ($FDOM == 0) {
@@ -413,7 +413,7 @@ 
      * @return array (0, 1, 2, 3, 4, 5, 6) 1 = Monday
      * @access protected
      */
-    function getWeekDays($y=null, $m=null, $d=null)
+    function getWeekDays($y = null, $m = null, $d = null)
     {
         return array(0, 1, 2, 3, 4, 5, 6);
     }
@@ -428,7 +428,7 @@ 
      * @return int (default 1 = Monday)
      * @access protected
      */
-    function getFirstDayOfWeek($y=null, $m=null, $d=null)
+    function getFirstDayOfWeek($y = null, $m = null, $d = null)
     {
         return 1;
     }
@@ -443,7 +443,7 @@ 
      * @return int (24)
      * @access protected
      */
-    function getHoursInDay($y=null,$m=null,$d=null)
+    function getHoursInDay($y = null, $m = null, $d = null)
     {
         return 24;
     }
@@ -459,7 +459,7 @@ 
      * @return int (60)
      * @access protected
      */
-    function getMinutesInHour($y=null,$m=null,$d=null,$h=null)
+    function getMinutesInHour($y = null, $m = null, $d = null, $h = null)
     {
         return 60;
     }
@@ -476,7 +476,7 @@ 
      * @return int (60)
      * @access protected
      */
-    function getSecondsInMinute($y=null,$m=null,$d=null,$h=null,$i=null)
+    function getSecondsInMinute($y = null, $m = null, $d = null, $h = null, $i = null)
     {
         return 60;
     }
@@ -496,7 +496,7 @@ 
             $today = new Date();
         }
         $date = PearDate::stampCollection($stamp);
-        return (   $date->day == $today->getDay()
+        return ($date->day == $today->getDay()
                 && $date->month == $today->getMonth()
                 && $date->year == $today->getYear()
         );

src/Minute.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
         include_once CALENDAR_ROOT.'Second.php';
         $sIM = $this->cE->getSecondsInMinute($this->year, $this->month,
                 $this->day, $this->hour, $this->minute);
-        for ($i=0; $i < $sIM; $i++) {
+        for ($i = 0; $i < $sIM; $i++) {
             $this->children[$i] = new Second($this->year, $this->month,
                 $this->day, $this->hour, $this->minute, $i);
         }

src/Factory.php

Switch Indentation +34 added lines, -34 removed lines

@@ -96,41 +96,41 @@
     {
         $firstDay = defined('CALENDAR_FIRST_DAY_OF_WEEK') ? CALENDAR_FIRST_DAY_OF_WEEK : 1;
         switch ($type) {
-        case 'Day':
-            return new Day($y, $m, $d);
-        case 'Month':
-            // Set default state for which month type to build
-            if (!defined('CALENDAR_MONTH_STATE')) {
-                define('CALENDAR_MONTH_STATE', CALENDAR_USE_MONTH);
-            }
-            switch (CALENDAR_MONTH_STATE) {
-            case CALENDAR_USE_MONTH_WEEKDAYS:
-                $class = 'Calendar_Month_Weekdays';
-                break;
-            case CALENDAR_USE_MONTH_WEEKS:
-                $class = 'Calendar_Month_Weeks';
-                break;
-            case CALENDAR_USE_MONTH:
-            default:
-                $class = 'Pear\Calendar\Month';
-                break;
-            }
+            case 'Day':
+                return new Day($y, $m, $d);
+            case 'Month':
+                // Set default state for which month type to build
+                if (!defined('CALENDAR_MONTH_STATE')) {
+                    define('CALENDAR_MONTH_STATE', CALENDAR_USE_MONTH);
+                }
+                switch (CALENDAR_MONTH_STATE) {
+                    case CALENDAR_USE_MONTH_WEEKDAYS:
+                        $class = 'Calendar_Month_Weekdays';
+                        break;
+                    case CALENDAR_USE_MONTH_WEEKS:
+                        $class = 'Calendar_Month_Weeks';
+                        break;
+                    case CALENDAR_USE_MONTH:
+                    default:
+                        $class = 'Pear\Calendar\Month';
+                        break;
+                }
             return new $class($y, $m, $firstDay);
-        case 'Week':
-            return new Week($y, $m, $d, $firstDay);
-        case 'Hour':
-            return new Hour($y, $m, $d, $h);
-        case 'Minute':
-            return new Minute($y, $m, $d, $h, $i);
-        case 'Second':
-            return new Second($y, $m, $d, $h, $i, $s);
-        case 'Year':
-            return new Year($y);
-        default:
-            include_once 'PEAR.php';
-            PEAR::raiseError('Calendar_Factory::create() unrecognised type: '.$type,
-                null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Factory::create()');
-            return false;
+            case 'Week':
+                return new Week($y, $m, $d, $firstDay);
+            case 'Hour':
+                return new Hour($y, $m, $d, $h);
+            case 'Minute':
+                return new Minute($y, $m, $d, $h, $i);
+            case 'Second':
+                return new Second($y, $m, $d, $h, $i, $s);
+            case 'Year':
+                return new Year($y);
+            default:
+                include_once 'PEAR.php';
+                PEAR::raiseError('Calendar_Factory::create() unrecognised type: '.$type,
+                    null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Factory::create()');
+                return false;
         }
     }
 

src/Month.php

Spacing +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
      *
      * @access public
      */
-    function __construct($y, $m, $firstDay=null)
+    function __construct($y, $m, $firstDay = null)
     {
         parent::__construct($y, $m);
         $this->firstDay = $this->defineFirstDayOfWeek($firstDay);
@@ -99,7 +99,7 @@ 
     {
         include_once CALENDAR_ROOT.'Day.php';
         $daysInMonth = $this->cE->getDaysInMonth($this->year, $this->month);
-        for ($i=1; $i<=$daysInMonth; $i++) {
+        for ($i = 1; $i <= $daysInMonth; $i++) {
             $this->children[$i] = new Day($this->year, $this->month, $i);
         }
         if (count($sDates) > 0) {

src/Util/Textual.php

Spacing +8 added lines, -8 removed lines

@@ -80,10 +80,10 @@ 
             $format = 'long';
         }
         $months = array();
-        for ($i=1; $i<=12; $i++) {
+        for ($i = 1; $i <= 12; $i++) {
             $stamp = mktime(0, 0, 0, $i, 1, 2003);
             $month = strftime($formats[$format], $stamp);
-            switch($format) {
+            switch ($format) {
             case 'one':
                 $month = substr($month, 0, 1);
                 break;
@@ -117,10 +117,10 @@ 
             $format = 'long';
         }
         $days = array();
-        for ($i=0; $i<=6; $i++) {
-            $stamp = mktime(0, 0, 0, 11, $i+2, 2003);
+        for ($i = 0; $i <= 6; $i++) {
+            $stamp = mktime(0, 0, 0, 11, $i + 2, 2003);
             $day = strftime($formats[$format], $stamp);
-            switch($format) {
+            switch ($format) {
             case 'one':
                 $day = substr($day, 0, 1);
                 break;
@@ -212,7 +212,7 @@ 
      * @access public
      * @static
      */
-    function thisDayName($Calendar, $format='long')
+    function thisDayName($Calendar, $format = 'long')
     {
         $days = Textual::weekdayNames($format);
         $stamp = $Calendar->thisDay('timestamp');
@@ -231,7 +231,7 @@ 
      * @access public
      * @static
      */
-    function nextDayName($Calendar, $format='long')
+    function nextDayName($Calendar, $format = 'long')
     {
         $days = Textual::weekdayNames($format);
         $stamp = $Calendar->nextDay('timestamp');
@@ -264,7 +264,7 @@ 
             //check if defined / set
             if (defined('CALENDAR_FIRST_DAY_OF_WEEK')) {
                 $firstDay = CALENDAR_FIRST_DAY_OF_WEEK;
-            } elseif(isset($Calendar->firstDay)) {
+            } elseif (isset($Calendar->firstDay)) {
                 $firstDay = $Calendar->firstDay;
             }
             $ordereddays = array();

src/Month/Weekdays.php

Spacing +6 added lines, -6 removed lines

@@ -113,7 +113,7 @@ 
      *
      * @access public
      */
-    function __construct($y, $m, $firstDay=null)
+    function __construct($y, $m, $firstDay = null)
     {
         parent::__construct($y, $m, $firstDay);
     }
@@ -151,7 +151,7 @@ 
     function buildEmptyDaysBefore()
     {
         $eBefore = $this->tableHelper->getEmptyDaysBefore();
-        for ($i=0; $i < $eBefore; $i++) {
+        for ($i = 0; $i < $eBefore; $i++) {
             $stamp = $this->cE->dateToStamp($this->year, $this->month, -$i);
             $Day = new Day(
                                 $this->cE->stampToYear($stamp),
@@ -187,8 +187,8 @@ 
     {
         $eAfter = $this->tableHelper->getEmptyDaysAfter();
         $sDOM   = $this->tableHelper->getNumTableDaysInMonth();
-        for ($i=1; $i <= $sDOM-$eAfter; $i++) {
-            $Day = new Day($this->year, $this->month+1, $i);
+        for ($i = 1; $i <= $sDOM - $eAfter; $i++) {
+            $Day = new Day($this->year, $this->month + 1, $i);
             $Day->setEmpty();
             $Day->adjust();
             array_push($this->children, $Day);
@@ -210,9 +210,9 @@ 
             $this->thisDay()
         );
         $sDOM = $this->tableHelper->getNumTableDaysInMonth();
-        for ($i=1; $i <= $sDOM; $i+= $dIW) {
+        for ($i = 1; $i <= $sDOM; $i += $dIW) {
             $this->children[$i]->setFirst();
-            $this->children[$i+($dIW-1)]->setLast();
+            $this->children[$i + ($dIW - 1)]->setLast();
         }
     }
 }