FriendsOfPear / Calendar

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

Switch Indentation +12 added lines, -12 removed lines

@@ -96,12 +96,12 @@ 
             $stamp = mktime(0, 0, 0, $i, 1, 2003);
             $month = strftime($formats[$format], $stamp);
             switch($format) {
-            case 'one':
-                $month = substr($month, 0, 1);
-                break;
-            case 'two':
-                $month = substr($month, 0, 2);
-                break;
+                case 'one':
+                    $month = substr($month, 0, 1);
+                    break;
+                case 'two':
+                    $month = substr($month, 0, 2);
+                    break;
             }
             $months[$i] = $month;
         }
@@ -133,12 +133,12 @@ 
             $stamp = mktime(0, 0, 0, 11, $i+2, 2003);
             $day = strftime($formats[$format], $stamp);
             switch($format) {
-            case 'one':
-                $day = substr($day, 0, 1);
-                break;
-            case 'two':
-                $day = substr($day, 0, 2);
-                break;
+                case 'one':
+                    $day = substr($day, 0, 1);
+                    break;
+                case 'two':
+                    $day = substr($day, 0, 2);
+                    break;
             }
             $days[$i] = $day;
         }

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/Util/Uri.php

Spacing +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
      *
      * @access public
      */
-    function __construct($y, $m=null, $d=null, $h=null, $i=null, $s=null)
+    function __construct($y, $m = null, $d = null, $h = null, $i = null, $s = null)
     {
         $this->setFragments($y, $m, $d, $h, $i, $s);
     }
@@ -116,7 +116,7 @@ 
      * @return void
      * @access public
      */
-    function setFragments($y, $m=null, $d=null, $h=null, $i=null, $s=null) 
+    function setFragments($y, $m = null, $d = null, $h = null, $i = null, $s = null) 
     {
         if (!is_null($y)) $this->uris['Year']   = $y;
         if (!is_null($m)) $this->uris['Month']  = $m;

Braces +18 added lines, -6 removed lines

@@ -118,12 +118,24 @@
      */
     function setFragments($y, $m=null, $d=null, $h=null, $i=null, $s=null) 
     {
-        if (!is_null($y)) $this->uris['Year']   = $y;
-        if (!is_null($m)) $this->uris['Month']  = $m;
-        if (!is_null($d)) $this->uris['Day']    = $d;
-        if (!is_null($h)) $this->uris['Hour']   = $h;
-        if (!is_null($i)) $this->uris['Minute'] = $i;
-        if (!is_null($s)) $this->uris['Second'] = $s;
+        if (!is_null($y)) {
+            $this->uris['Year']   = $y;
+        }
+        if (!is_null($m)) {
+            $this->uris['Month']  = $m;
+        }
+        if (!is_null($d)) {
+            $this->uris['Day']    = $d;
+        }
+        if (!is_null($h)) {
+            $this->uris['Hour']   = $h;
+        }
+        if (!is_null($i)) {
+            $this->uris['Minute'] = $i;
+        }
+        if (!is_null($s)) {
+            $this->uris['Second'] = $s;
+        }
     }
 
     /**

src/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';

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();
         }
     }
 }

src/Month/Weeks.php

Spacing +3 added lines, -3 removed lines

@@ -105,7 +105,7 @@ 
      *
      * @access public
      */
-    function __construct($y, $m, $firstDay=null)
+    function __construct($y, $m, $firstDay = null)
     {
         parent::__construct($y, $m, $firstDay);
     }
@@ -124,8 +124,8 @@ 
         $this->tableHelper = new Helper($this, $this->firstDay);
         include_once CALENDAR_ROOT.'Week.php';
         $numWeeks = $this->tableHelper->getNumWeeks();
-        for ($i=1, $d=1; $i<=$numWeeks; $i++,
-            $d+=$this->cE->getDaysInWeek(
+        for ($i = 1, $d = 1; $i <= $numWeeks; $i++,
+            $d += $this->cE->getDaysInWeek(
                 $this->thisYear(),
                 $this->thisMonth(),
                 $this->thisDay()

src/Day.php

Spacing +2 added lines, -2 removed lines

@@ -119,7 +119,7 @@ 
         include_once CALENDAR_ROOT.'Hour.php';
 
         $hID = $this->cE->getHoursInDay($this->year, $this->month, $this->day);
-        for ($i=0; $i < $hID; $i++) {
+        for ($i = 0; $i < $hID; $i++) {
             $this->children[$i] =
                 new Hour($this->year, $this->month, $this->day, $i);
         }
@@ -214,7 +214,7 @@ 
      * @return void
      * @access private
      */
-    function setEmpty ($state = true)
+    function setEmpty($state = true)
     {
         $this->empty = $state;
     }

src/Calendar.php

Indentation +5 added lines, -5 removed lines

@@ -491,7 +491,7 @@ 
         if (defined('CALENDAR_FIRST_DAY_OF_WEEK')) {
             if (!is_null($firstDay) && ($firstDay != CALENDAR_FIRST_DAY_OF_WEEK)) {
                 $msg = 'CALENDAR_FIRST_DAY_OF_WEEK constant already defined.'
-                  .' The $firstDay parameter will be ignored.';
+                    .' The $firstDay parameter will be ignored.';
                 trigger_error($msg, E_USER_WARNING);
             }
             return CALENDAR_FIRST_DAY_OF_WEEK;
@@ -714,8 +714,8 @@ 
     }
 
     /**
-    * Returns the value for the next minute
-    *
+     * Returns the value for the next minute
+     *
      * @param string $format return value format ['int'|'timestamp'|'object'|'array']
      *
      * @return int e.g. 25 or timestamp
@@ -748,8 +748,8 @@ 
     /**
      * Returns the value for this second
      *
-    * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-    *
+     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
+     *
      * @return int e.g. 44 or timestamp
      * @access public
      */

Switch Indentation +20 added lines, -20 removed lines

@@ -88,13 +88,13 @@ 
     {
         static $engine = false;
         switch (CALENDAR_ENGINE) {
-        case 'PearDate':
-            $class = 'Calendar_Engine_PearDate';
-            break;
-        case 'UnixTS':
-        default:
-            $class = 'Pear\Calendar\Engine\UnixTS';
-            break;
+            case 'PearDate':
+                $class = 'Calendar_Engine_PearDate';
+                break;
+            case 'UnixTS':
+            default:
+                $class = 'Pear\Calendar\Engine\UnixTS';
+                break;
         }
         if (!$engine) {
             if (!class_exists($class)) {
@@ -341,19 +341,19 @@ 
     function returnValue($returnType, $format, $stamp, $default)
     {
         switch (strtolower($format)) {
-        case 'int':
-            return $default;
-        case 'array':
-            return $this->toArray($stamp);
-            break;
-        case 'object':
-            include_once CALENDAR_ROOT.'Factory.php';
-            return Factory::createByTimestamp($returnType, $stamp);
-            break;
-        case 'timestamp':
-        default:
-            return $stamp;
-            break;
+            case 'int':
+                return $default;
+            case 'array':
+                return $this->toArray($stamp);
+                break;
+            case 'object':
+                include_once CALENDAR_ROOT.'Factory.php';
+                return Factory::createByTimestamp($returnType, $stamp);
+                break;
+            case 'timestamp':
+            default:
+                return $stamp;
+                break;
         }
     }
 

Spacing +18 added lines, -18 removed lines

@@ -54,9 +54,9 @@ 
 /**
  * Define Calendar Month states
  */
-define('CALENDAR_USE_MONTH',          1);
+define('CALENDAR_USE_MONTH', 1);
 define('CALENDAR_USE_MONTH_WEEKDAYS', 2);
-define('CALENDAR_USE_MONTH_WEEKS',    3);
+define('CALENDAR_USE_MONTH_WEEKS', 3);
 
 /**
  * Contains a factory method to return a Singleton instance of a class
@@ -311,7 +311,7 @@ 
      * @return array
      * @access public
      */
-    function toArray($stamp=null)
+    function toArray($stamp = null)
     {
         if (is_null($stamp)) {
             $stamp = $this->getTimeStamp();
@@ -503,7 +503,7 @@ 
                 $this->thisDay()
             );
         }
-        define ('CALENDAR_FIRST_DAY_OF_WEEK', $firstDay);
+        define('CALENDAR_FIRST_DAY_OF_WEEK', $firstDay);
         return CALENDAR_FIRST_DAY_OF_WEEK;
     }
 
@@ -517,8 +517,8 @@ 
      */
     function prevYear($format = 'int')
     {
-        $ts = $this->cE->dateToStamp($this->year-1, 1, 1, 0, 0, 0);
-        return $this->returnValue('Year', $format, $ts, $this->year-1);
+        $ts = $this->cE->dateToStamp($this->year - 1, 1, 1, 0, 0, 0);
+        return $this->returnValue('Year', $format, $ts, $this->year - 1);
     }
 
     /**
@@ -545,8 +545,8 @@ 
      */
     function nextYear($format = 'int')
     {
-        $ts = $this->cE->dateToStamp($this->year+1, 1, 1, 0, 0, 0);
-        return $this->returnValue('Year', $format, $ts, $this->year+1);
+        $ts = $this->cE->dateToStamp($this->year + 1, 1, 1, 0, 0, 0);
+        return $this->returnValue('Year', $format, $ts, $this->year + 1);
     }
 
     /**
@@ -559,7 +559,7 @@ 
      */
     function prevMonth($format = 'int')
     {
-        $ts = $this->cE->dateToStamp($this->year, $this->month-1, 1, 0, 0, 0);
+        $ts = $this->cE->dateToStamp($this->year, $this->month - 1, 1, 0, 0, 0);
         return $this->returnValue('Month', $format, $ts, $this->cE->stampToMonth($ts));
     }
 
@@ -587,7 +587,7 @@ 
      */
     function nextMonth($format = 'int')
     {
-        $ts = $this->cE->dateToStamp($this->year, $this->month+1, 1, 0, 0, 0);
+        $ts = $this->cE->dateToStamp($this->year, $this->month + 1, 1, 0, 0, 0);
         return $this->returnValue('Month', $format, $ts, $this->cE->stampToMonth($ts));
     }
 
@@ -602,7 +602,7 @@ 
     function prevDay($format = 'int')
     {
         $ts = $this->cE->dateToStamp(
-            $this->year, $this->month, $this->day-1, 0, 0, 0);
+            $this->year, $this->month, $this->day - 1, 0, 0, 0);
         return $this->returnValue('Day', $format, $ts, $this->cE->stampToDay($ts));
     }
 
@@ -632,7 +632,7 @@ 
     function nextDay($format = 'int')
     {
         $ts = $this->cE->dateToStamp(
-            $this->year, $this->month, $this->day+1, 0, 0, 0);
+            $this->year, $this->month, $this->day + 1, 0, 0, 0);
         return $this->returnValue('Day', $format, $ts, $this->cE->stampToDay($ts));
     }
 
@@ -647,7 +647,7 @@ 
     function prevHour($format = 'int')
     {
         $ts = $this->cE->dateToStamp(
-            $this->year, $this->month, $this->day, $this->hour-1, 0, 0);
+            $this->year, $this->month, $this->day, $this->hour - 1, 0, 0);
         return $this->returnValue('Hour', $format, $ts, $this->cE->stampToHour($ts));
     }
 
@@ -677,7 +677,7 @@ 
     function nextHour($format = 'int')
     {
         $ts = $this->cE->dateToStamp(
-            $this->year, $this->month, $this->day, $this->hour+1, 0, 0);
+            $this->year, $this->month, $this->day, $this->hour + 1, 0, 0);
         return $this->returnValue('Hour', $format, $ts, $this->cE->stampToHour($ts));
     }
 
@@ -693,7 +693,7 @@ 
     {
         $ts = $this->cE->dateToStamp(
             $this->year, $this->month, $this->day,
-            $this->hour, $this->minute-1, 0);
+            $this->hour, $this->minute - 1, 0);
         return $this->returnValue('Minute', $format, $ts, $this->cE->stampToMinute($ts));
     }
 
@@ -725,7 +725,7 @@ 
     {
         $ts = $this->cE->dateToStamp(
             $this->year, $this->month, $this->day,
-            $this->hour, $this->minute+1, 0);
+            $this->hour, $this->minute + 1, 0);
         return $this->returnValue('Minute', $format, $ts, $this->cE->stampToMinute($ts));
     }
 
@@ -741,7 +741,7 @@ 
     {
         $ts = $this->cE->dateToStamp(
             $this->year, $this->month, $this->day,
-            $this->hour, $this->minute, $this->second-1);
+            $this->hour, $this->minute, $this->second - 1);
         return $this->returnValue('Second', $format, $ts, $this->cE->stampToSecond($ts));
     }
 
@@ -773,7 +773,7 @@ 
     {
         $ts = $this->cE->dateToStamp(
             $this->year, $this->month, $this->day,
-            $this->hour, $this->minute, $this->second+1);
+            $this->hour, $this->minute, $this->second + 1);
         return $this->returnValue('Second', $format, $ts, $this->cE->stampToSecond($ts));
     }
 }