FriendsOfPear / Calendar

Calendar/Engine/UnixTS.php

Spacing +12 added lines, -12 removed lines

@@ -76,7 +76,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");
         }
@@ -180,7 +180,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])) {
@@ -219,7 +219,7 @@ 
      * @return int (12)
      * @access protected
      */
-    function getMonthsInYear($y=null)
+    function getMonthsInYear($y = null)
     {
         return 12;
     }
@@ -267,7 +267,7 @@ 
      * @return int (7)
      * @access protected
      */
-    function getDaysInWeek($y=null, $m=null, $d=null)
+    function getDaysInWeek($y = null, $m = null, $d = null)
     {
         return 7;
     }
@@ -300,9 +300,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
@@ -370,7 +370,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);
     }
@@ -385,7 +385,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;
     }
@@ -400,7 +400,7 @@ 
      * @return int (24)
      * @access protected
      */
-    function getHoursInDay($y=null, $m=null, $d=null)
+    function getHoursInDay($y = null, $m = null, $d = null)
     {
         return 24;
     }
@@ -416,7 +416,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;
     }
@@ -433,7 +433,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;
     }
@@ -454,7 +454,7 @@ 
             $today = sscanf($today_date, '%d %d %d');
         }
         $date = Calendar_Engine_UnixTS::stampCollection($stamp);
-        return (   $date[2] == $today[2]
+        return ($date[2] == $today[2]
                 && $date[1] == $today[1]
                 && $date[0] == $today[0]
         );

Calendar/Engine/PearDate.php

Spacing +15 added lines, -15 removed lines

@@ -171,7 +171,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();
         Calendar_Engine_PearDate::adjustDate($y, $m, $d, $h, $i, $s);
@@ -222,8 +222,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) {
@@ -234,7 +234,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++;
@@ -275,7 +275,7 @@ 
      * @return int (12)
      * @access protected
      */
-    function getMonthsInYear($y=null)
+    function getMonthsInYear($y = null)
     {
         return 12;
     }
@@ -319,7 +319,7 @@ 
      * @return int (7)
      * @access protected
      */
-    function getDaysInWeek($y=null, $m=null, $d=null)
+    function getDaysInWeek($y = null, $m = null, $d = null)
     {
         return 7;
     }
@@ -352,9 +352,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) {
@@ -374,7 +374,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) {
@@ -417,7 +417,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);
     }
@@ -432,7 +432,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;
     }
@@ -447,7 +447,7 @@ 
      * @return int (24)
      * @access protected
      */
-    function getHoursInDay($y=null,$m=null,$d=null)
+    function getHoursInDay($y = null, $m = null, $d = null)
     {
         return 24;
     }
@@ -463,7 +463,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;
     }
@@ -480,7 +480,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;
     }
@@ -500,7 +500,7 @@ 
             $today = new Date();
         }
         $date = Calendar_Engine_PearDate::stampCollection($stamp);
-        return (   $date->day == $today->getDay()
+        return ($date->day == $today->getDay()
                 && $date->month == $today->getMonth()
                 && $date->year == $today->getYear()
         );

Calendar/Year.php

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
         include_once CALENDAR_ROOT.'Factory.php';
         $this->firstDay = $this->defineFirstDayOfWeek($firstDay);
         $monthsInYear   = $this->cE->getMonthsInYear($this->thisYear());
-        for ($i=1; $i <= $monthsInYear; $i++) {
+        for ($i = 1; $i <= $monthsInYear; $i++) {
             $this->children[$i] = Calendar_Factory::create('Month', $this->year, $i);
         }
         if (count($sDates) > 0) {

Calendar/Minute.php

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,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 Calendar_Second($this->year, $this->month,
                 $this->day, $this->hour, $this->minute, $i);
         }

Calendar/Decorator.php

Indentation +2 added lines, -2 removed lines

@@ -393,7 +393,7 @@ 
      *
      * @return int e.g. 4 or Unix timestamp
      * @access public
-      */
+     */
     function prevMonth($format = 'int')
     {
         return $this->calendar->prevMonth($format);
@@ -432,7 +432,7 @@ 
      *
      * @return int e.g. 4 or Unix timestamp
      * @access public
-      */
+     */
     function prevWeek($format = 'n_in_month')
     {
         if ( method_exists($this->calendar, 'prevWeek')) {

Spacing +4 added lines, -4 removed lines

@@ -240,7 +240,7 @@ 
      * @return void
      * @access private
      */
-    function setEmpty ($state = true)
+    function setEmpty($state = true)
     {
         if (method_exists($this->calendar, 'setEmpty')) {
             $this->calendar->setEmpty($state);
@@ -435,7 +435,7 @@ 
       */
     function prevWeek($format = 'n_in_month')
     {
-        if ( method_exists($this->calendar, 'prevWeek')) {
+        if (method_exists($this->calendar, 'prevWeek')) {
             return $this->calendar->prevWeek($format);
         } else {
             include_once 'PEAR.php';
@@ -457,7 +457,7 @@ 
      */
     function thisWeek($format = 'n_in_month')
     {
-        if ( method_exists($this->calendar, 'thisWeek')) {
+        if (method_exists($this->calendar, 'thisWeek')) {
             return $this->calendar->thisWeek($format);
         } else {
             include_once 'PEAR.php';
@@ -479,7 +479,7 @@ 
      */
     function nextWeek($format = 'n_in_month')
     {
-        if ( method_exists($this->calendar, 'nextWeek')) {
+        if (method_exists($this->calendar, 'nextWeek')) {
             return $this->calendar->nextWeek($format);
         } else {
             include_once 'PEAR.php';

Calendar/Factory.php

Switch Indentation +43 added lines, -43 removed lines

@@ -95,50 +95,50 @@
     {
         $firstDay = defined('CALENDAR_FIRST_DAY_OF_WEEK') ? CALENDAR_FIRST_DAY_OF_WEEK : 1;
         switch ($type) {
-        case 'Day':
-            include_once CALENDAR_ROOT.'Day.php';
-            return new Calendar_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:
-                include_once CALENDAR_ROOT.'Month/Weekdays.php';
-                $class = 'Calendar_Month_Weekdays';
-                break;
-            case CALENDAR_USE_MONTH_WEEKS:
-                include_once CALENDAR_ROOT.'Month/Weeks.php';
-                $class = 'Calendar_Month_Weeks';
-                break;
-            case CALENDAR_USE_MONTH:
-            default:
-                include_once CALENDAR_ROOT.'Month.php';
-                $class = 'Calendar_Month';
-                break;
-            }
+            case 'Day':
+                include_once CALENDAR_ROOT.'Day.php';
+                return new Calendar_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:
+                        include_once CALENDAR_ROOT.'Month/Weekdays.php';
+                        $class = 'Calendar_Month_Weekdays';
+                        break;
+                    case CALENDAR_USE_MONTH_WEEKS:
+                        include_once CALENDAR_ROOT.'Month/Weeks.php';
+                        $class = 'Calendar_Month_Weeks';
+                        break;
+                    case CALENDAR_USE_MONTH:
+                    default:
+                        include_once CALENDAR_ROOT.'Month.php';
+                        $class = 'Calendar_Month';
+                        break;
+                }
             return new $class($y, $m, $firstDay);
-        case 'Week':
-            include_once CALENDAR_ROOT.'Week.php';
-            return new Calendar_Week($y, $m, $d, $firstDay);
-        case 'Hour':
-            include_once CALENDAR_ROOT.'Hour.php';
-            return new Calendar_Hour($y, $m, $d, $h);
-        case 'Minute':
-            include_once CALENDAR_ROOT.'Minute.php';
-            return new Calendar_Minute($y, $m, $d, $h, $i);
-        case 'Second':
-            include_once CALENDAR_ROOT.'Second.php';
-            return new Calendar_Second($y, $m, $d, $h, $i, $s);
-        case 'Year':
-            include_once CALENDAR_ROOT.'Year.php';
-            return new Calendar_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':
+                include_once CALENDAR_ROOT.'Week.php';
+                return new Calendar_Week($y, $m, $d, $firstDay);
+            case 'Hour':
+                include_once CALENDAR_ROOT.'Hour.php';
+                return new Calendar_Hour($y, $m, $d, $h);
+            case 'Minute':
+                include_once CALENDAR_ROOT.'Minute.php';
+                return new Calendar_Minute($y, $m, $d, $h, $i);
+            case 'Second':
+                include_once CALENDAR_ROOT.'Second.php';
+                return new Calendar_Second($y, $m, $d, $h, $i, $s);
+            case 'Year':
+                include_once CALENDAR_ROOT.'Year.php';
+                return new Calendar_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;
         }
     }
 

Calendar/Validator.php

Spacing +4 added lines, -4 removed lines

@@ -204,7 +204,7 @@ 
                 'Hour', $h, CALENDAR_VALUE_TOOSMALL.$min);
             return false;
         }
-        $max = ($this->cE->getHoursInDay($this->calendar->thisDay())-1);
+        $max = ($this->cE->getHoursInDay($this->calendar->thisDay()) - 1);
         if ($h > $max) {
             $this->errors[] = new Calendar_Validation_Error(
                 'Hour', $h, CALENDAR_VALUE_TOOLARGE.$max);
@@ -228,7 +228,7 @@ 
                 'Minute', $i, CALENDAR_VALUE_TOOSMALL.$min);
             return false;
         }
-        $max = ($this->cE->getMinutesInHour($this->calendar->thisHour())-1);
+        $max = ($this->cE->getMinutesInHour($this->calendar->thisHour()) - 1);
         if ($i > $max) {
             $this->errors[] = new Calendar_Validation_Error(
                 'Minute', $i, CALENDAR_VALUE_TOOLARGE.$max);
@@ -252,7 +252,7 @@ 
                 'Second', $s, CALENDAR_VALUE_TOOSMALL.$min);
             return false;
         }
-        $max = ($this->cE->getSecondsInMinute($this->calendar->thisMinute())-1);
+        $max = ($this->cE->getSecondsInMinute($this->calendar->thisMinute()) - 1);
         if ($s > $max) {
             $this->errors[] = new Calendar_Validation_Error(
                 'Second', $s, CALENDAR_VALUE_TOOLARGE.$max);
@@ -369,7 +369,7 @@ 
      * @return string
      * @access public
      */
-    function toString ()
+    function toString()
     {
         return $this->unit.' = '.$this->value.' ['.$this->message.']';
     }

Calendar/Table/Helper.php

Spacing +5 added lines, -5 removed lines

@@ -114,7 +114,7 @@ 
      *
      * @access protected
      */
-    function __construct(& $calendar, $firstDay=null)
+    function __construct(& $calendar, $firstDay = null)
     {
         $this->calendar = & $calendar;
         $this->cE = & $calendar->getEngine();
@@ -172,7 +172,7 @@ 
             $this->calendar->thisYear(), $this->calendar->thisMonth());
         $firstDayInMonth = $this->cE->getFirstDayInMonth(
             $this->calendar->thisYear(), $this->calendar->thisMonth());
-        $this->emptyBefore=0;
+        $this->emptyBefore = 0;
         foreach ($this->daysOfMonth as $dayOfWeek) {
             if ($firstDayInMonth == $dayOfWeek) {
                 break;
@@ -188,7 +188,7 @@ 
                 $this->calendar->thisDay()
             )
         );
-        for ($i=1; $i < $this->numWeeks; $i++) {
+        for ($i = 1; $i < $this->numWeeks; $i++) {
             $this->daysOfMonth =
                 array_merge($this->daysOfMonth, $this->daysOfWeek);
         }
@@ -283,7 +283,7 @@ 
                 $this->calendar->thisYear(),
                 $this->calendar->thisMonth(),
                 $this->calendar->thisDay()
-            ) * ($this->numWeeks-1));
+            ) * ($this->numWeeks - 1));
     }
 
     /**
@@ -296,7 +296,7 @@ 
      *
      * @return int timestamp
      */
-    function getWeekStart($y, $m, $d, $firstDay=1)
+    function getWeekStart($y, $m, $d, $firstDay = 1)
     {
         $dow = $this->cE->getDayOfWeek($y, $m, $d);
         if ($dow > $firstDay) {

Calendar/Month.php

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
      *
      * @access public
      */
-    function __construct($y, $m, $firstDay=null)
+    function __construct($y, $m, $firstDay = null)
     {
         parent::__construct($y, $m);
         $this->firstDay = $this->defineFirstDayOfWeek($firstDay);
@@ -98,7 +98,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 Calendar_Day($this->year, $this->month, $i);
         }
         if (count($sDates) > 0) {