Inspection of "PSR-4" - FriendsOfPear/Calendar - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — master (#2)

by tsms

created 2019-03-12 04:49 UTC

Status

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -14,18 +14,18 @@
 block discarded – undo
 // Build the month
 $Calendar = new Calendar_Month_Weekdays($_GET['jahr'], $_GET['monat']);
 
-echo ( '<p>The current month is '
+echo ('<p>The current month is '
         .$Calendar->thisMonth().' of year '.$Calendar->thisYear().'</p>');
 
 $Uri = & new Calendar_Decorator_Uri($Calendar);
-$Uri->setFragments('jahr','monat');
+$Uri->setFragments('jahr', 'monat');
 // $Uri->setSeperator('/'); // Default is &
 // $Uri->setScalar(); // Omit variable names
-echo ( "<pre>Previous Uri:\t".$Uri->prev('month')."\n" );
-echo ( "This Uri:\t".$Uri->this('month')."\n" );
-echo ( "Next Uri:\t".$Uri->next('month')."\n</pre>" );
+echo ("<pre>Previous Uri:\t".$Uri->prev('month')."\n");
+echo ("This Uri:\t".$Uri->this('month')."\n");
+echo ("Next Uri:\t".$Uri->next('month')."\n</pre>");
 ?>
 <p>
-<a href="<?php echo($_SERVER['PHP_SELF'].'?'.$Uri->prev('month'));?>">Prev</a> :
-<a href="<?php echo($_SERVER['PHP_SELF'].'?'.$Uri->next('month'));?>">Next</a>
+<a href="<?php echo($_SERVER['PHP_SELF'].'?'.$Uri->prev('month')); ?>">Prev</a> :
+<a href="<?php echo($_SERVER['PHP_SELF'].'?'.$Uri->next('month')); ?>">Next</a>
 </p>
\ No newline at end of file

Please login to merge, or discard this patch.

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -8,8 +8,12 @@
 block discarded – undo
 require_once CALENDAR_ROOT.'Month/Weekdays.php';
 require_once CALENDAR_ROOT.'Decorator/Uri.php';
 
-if (!isset($_GET['jahr'])) $_GET['jahr'] = date('Y');
-if (!isset($_GET['monat'])) $_GET['monat'] = date('m');
+if (!isset($_GET['jahr'])) {
+    $_GET['jahr'] = date('Y');
+}
+if (!isset($_GET['monat'])) {
+    $_GET['monat'] = date('m');
+}
 
 // Build the month
 $Calendar = new Calendar_Month_Weekdays($_GET['jahr'], $_GET['monat']);

Please login to merge, or discard this patch.

docs/examples/11.php 1 patch

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

@@ -3,8 +3,8 @@  discard block
 block discarded – undo
 * Description: demonstrates a decorator used to "attach a payload" to a selection
 * to make it available when iterating over calendar children
 */
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
+if (!@include 'Calendar/Calendar.php') {
+    define('CALENDAR_ROOT', '../../');
 }
 require_once CALENDAR_ROOT.'Day.php';
 require_once CALENDAR_ROOT.'Hour.php';
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 }
 
 // Create a day to view the hours for
-$Day = & new Calendar_Day(2003,10,24);
+$Day = & new Calendar_Day(2003, 10, 24);
 
 // A sample query to get the data for today (NOT ACTUALLY USED HERE)
 $sql = "
@@ -39,18 +39,18 @@  discard block
 block discarded – undo
             eventtime < '".$Day->nextDay(TRUE)."';";
 
 // An array simulating data from a database
-$result = array (
-    array('eventtime'=>mktime(9,0,0,10,24,2003),'entry'=>'Meeting with sales team'),
-    array('eventtime'=>mktime(11,0,0,10,24,2003),'entry'=>'Conference call with Widget Inc.'),
-    array('eventtime'=>mktime(15,0,0,10,24,2003),'entry'=>'Presentation to board of directors')
+$result = array(
+    array('eventtime'=>mktime(9, 0, 0, 10, 24, 2003), 'entry'=>'Meeting with sales team'),
+    array('eventtime'=>mktime(11, 0, 0, 10, 24, 2003), 'entry'=>'Conference call with Widget Inc.'),
+    array('eventtime'=>mktime(15, 0, 0, 10, 24, 2003), 'entry'=>'Presentation to board of directors')
     );
 
 // An array to place selected hours in
 $selection = array();
 
 // Loop through the "database result"
-foreach ( $result as $row ) {
-    $Hour = new Calendar_Hour(2000,1,1,1); // Create Hour with dummy values
+foreach ($result as $row) {
+    $Hour = new Calendar_Hour(2000, 1, 1, 1); // Create Hour with dummy values
     $Hour->setTimeStamp($row['eventtime']); // Set the real time with setTimeStamp
 
     // Create the decorator, passing it the Hour
@@ -74,36 +74,36 @@  discard block
 block discarded – undo
 <body>
 <h1>Passing a Selection "Payload" using a Decorator</h1>
 <table>
-<caption><b>Your Schedule for <?php echo ( date('D nS F Y',$Day->thisDay(TRUE)) ); ?></b></caption>
+<caption><b>Your Schedule for <?php echo (date('D nS F Y', $Day->thisDay(TRUE))); ?></b></caption>
 <tr>
 <th width="5%">Time</th>
 <th>Entry</th>
 </tr>
 <?php
-while ( $Hour = & $Day->fetch() ) {
+while ($Hour = & $Day->fetch()) {
 
     $hour = $Hour->thisHour();
     $minute = $Hour->thisMinute();
 
     // Office hours only...
-    if ( $hour >= 8 && $hour <= 18 ) {
-        echo ( "<tr>\n" );
-        echo ( "<td>$hour:$minute</td>\n" );
+    if ($hour >= 8 && $hour <= 18) {
+        echo ("<tr>\n");
+        echo ("<td>$hour:$minute</td>\n");
 
         // If the hour is selected, call the decorator method...
-        if ( $Hour->isSelected() ) {
-            echo ( "<td bgcolor=\"silver\">".$Hour->getEntry()."</td>\n" );
+        if ($Hour->isSelected()) {
+            echo ("<td bgcolor=\"silver\">".$Hour->getEntry()."</td>\n");
         } else {
-            echo ( "<td>&nbsp;</td>\n" );
+            echo ("<td>&nbsp;</td>\n");
         }
-        echo ( "</tr>\n" );
+        echo ("</tr>\n");
     }
 }
 ?>
 </table>
 <p>The query to fetch this data, with help from PEAR::Calendar, might be;</p>
 <pre>
-<?php echo ( $sql ); ?>
+<?php echo ($sql); ?>
 </pre>
 </body>
 </html>
\ No newline at end of file

Please login to merge, or discard this patch.

docs/examples/23.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -25,12 +25,12 @@  discard block
 block discarded – undo
 echo "<hr>Creating: new Calendar_Day(date('Y'), date('n'), date('d'));<br />";
 $Calendar = new Calendar_Day(date('Y'), date('n'), date('d'));
 
-echo '<hr>Previous month is: '.Calendar_Util_Textual::prevMonthName($Calendar,'two').'<br />';
-echo 'This month is: '.Calendar_Util_Textual::thisMonthName($Calendar,'short').'<br />';
+echo '<hr>Previous month is: '.Calendar_Util_Textual::prevMonthName($Calendar, 'two').'<br />';
+echo 'This month is: '.Calendar_Util_Textual::thisMonthName($Calendar, 'short').'<br />';
 echo 'Next month is: '.Calendar_Util_Textual::nextMonthName($Calendar).'<br /><hr />';
 echo 'Previous day is: '.Calendar_Util_Textual::prevDayName($Calendar).'<br />';
-echo 'This day is: '.Calendar_Util_Textual::thisDayName($Calendar,'short').'<br />';
-echo 'Next day is: '.Calendar_Util_Textual::nextDayName($Calendar,'one').'<br /><hr />';
+echo 'This day is: '.Calendar_Util_Textual::thisDayName($Calendar, 'short').'<br />';
+echo 'Next day is: '.Calendar_Util_Textual::nextDayName($Calendar, 'one').'<br /><hr />';
 
 echo "Creating: new Calendar_Month_Weekdays(date('Y'), date('n'), 6); - Saturday is first day of week<br />";
 $Calendar = new Calendar_Month_Weekdays(date('Y'), date('n'), 6);
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
 <caption><?php echo Calendar_Util_Textual::thisMonthName($Calendar).' '.$Calendar->thisYear(); ?></caption>
 <tr>
 <?php
-$dayheaders = Calendar_Util_Textual::orderedWeekdays($Calendar,'short');
+$dayheaders = Calendar_Util_Textual::orderedWeekdays($Calendar, 'short');
 foreach ($dayheaders as $dayheader) {
     echo '<th>'.$dayheader.'</th>';
 }

Please login to merge, or discard this patch.

Calendar/Util/Textual.php 2 patches

Switch Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -96,12 +96,12 @@  discard block
 block discarded – undo
             $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 @@  discard block
 block discarded – undo
             $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;
         }

Please login to merge, or discard this patch.

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -80,10 +80,10 @@  discard block
 block discarded – undo
             $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 @@  discard block
 block discarded – undo
             $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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
             //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();

Please login to merge, or discard this patch.

Calendar/Util/Uri.php 2 patches

Braces +18 added lines, -6 removed lines patch added patch discarded remove patch

		@@ -118,12 +118,24 @@
		block discarded – undo
118	118	*/
119	119	function setFragments($y, $m=null, $d=null, $h=null, $i=null, $s=null)
120	120	{
121		- if (!is_null($y)) $this->uris['Year'] = $y;
122		- if (!is_null($m)) $this->uris['Month'] = $m;
123		- if (!is_null($d)) $this->uris['Day'] = $d;
124		- if (!is_null($h)) $this->uris['Hour'] = $h;
125		- if (!is_null($i)) $this->uris['Minute'] = $i;
126		- if (!is_null($s)) $this->uris['Second'] = $s;
	121	+ if (!is_null($y)) {
	122	+ $this->uris['Year'] = $y;
	123	+ }
	124	+ if (!is_null($m)) {
	125	+ $this->uris['Month'] = $m;
	126	+ }
	127	+ if (!is_null($d)) {
	128	+ $this->uris['Day'] = $d;
	129	+ }
	130	+ if (!is_null($h)) {
	131	+ $this->uris['Hour'] = $h;
	132	+ }
	133	+ if (!is_null($i)) {
	134	+ $this->uris['Minute'] = $i;
	135	+ }
	136	+ if (!is_null($s)) {
	137	+ $this->uris['Second'] = $s;
	138	+ }
127	139	}
128	140
129	141	/**

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -98,7 +98,7 @@  discard block
 block discarded – undo
      *
      * @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 @@  discard block
 block discarded – undo
      * @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;

Please login to merge, or discard this patch.

Calendar/Calendar.php 3 patches

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -491,7 +491,7 @@  discard block
 block discarded – undo
         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 @@  discard block
 block discarded – undo
     }
 
     /**
-    * 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 @@  discard block
 block discarded – undo
     /**
      * 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
      */

Please login to merge, or discard this patch.

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

@@ -54,9 +54,9 @@  discard block
 block discarded – undo
 /**
  * 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 @@  discard block
 block discarded – undo
      * @return array
      * @access public
      */
-    function toArray($stamp=null)
+    function toArray($stamp = null)
     {
         if (is_null($stamp)) {
             $stamp = $this->getTimeStamp();
@@ -503,7 +503,7 @@  discard block
 block discarded – undo
                 $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 @@  discard block
 block discarded – undo
      */
     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 @@  discard block
 block discarded – undo
      */
     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 @@  discard block
 block discarded – undo
      */
     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 @@  discard block
 block discarded – undo
      */
     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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
     {
         $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 @@  discard block
 block discarded – undo
     {
         $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 @@  discard block
 block discarded – undo
     {
         $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 @@  discard block
 block discarded – undo
     {
         $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));
     }
 }

Please login to merge, or discard this patch.

Switch Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -88,13 +88,13 @@  discard block
 block discarded – undo
     {
         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 @@  discard block
 block discarded – undo
     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;
         }
     }
 

Please login to merge, or discard this patch.

Calendar/Decorator.php 2 patches

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -240,7 +240,7 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
       */
     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 @@  discard block
 block discarded – undo
      */
     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 @@  discard block
 block discarded – undo
      */
     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';

Please login to merge, or discard this patch.

Calendar/Validator.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -204,7 +204,7 @@  discard block
 block discarded – undo
                 '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 @@  discard block
 block discarded – undo
                 '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 @@  discard block
 block discarded – undo
                 '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 @@  discard block
 block discarded – undo
      * @return string
      * @access public
      */
-    function toString ()
+    function toString()
     {
         return $this->unit.' = '.$this->value.' ['.$this->message.']';
     }

Please login to merge, or discard this patch.

Calendar/Table/Helper.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -114,7 +114,7 @@  discard block
 block discarded – undo
      *
      * @access protected
      */
-    function __construct(& $calendar, $firstDay=null)
+    function __construct(& $calendar, $firstDay = null)
     {
         $this->calendar = & $calendar;
         $this->cE = & $calendar->getEngine();
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
             $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 @@  discard block
 block discarded – undo
                 $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 @@  discard block
 block discarded – undo
                 $this->calendar->thisYear(),
                 $this->calendar->thisMonth(),
                 $this->calendar->thisDay()
-            ) * ($this->numWeeks-1));
+            ) * ($this->numWeeks - 1));
     }
 
     /**
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
      *
      * @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) {

Please login to merge, or discard this patch.

		@@ -491,7 +491,7 @@ discard block
		block discarded – undo
491	491	if (defined('CALENDAR_FIRST_DAY_OF_WEEK')) {
492	492	if (!is_null($firstDay) && ($firstDay != CALENDAR_FIRST_DAY_OF_WEEK)) {
493	493	$msg = 'CALENDAR_FIRST_DAY_OF_WEEK constant already defined.'
494		- .' The $firstDay parameter will be ignored.';
	494	+ .' The $firstDay parameter will be ignored.';
495	495	trigger_error($msg, E_USER_WARNING);
496	496	}
497	497	return CALENDAR_FIRST_DAY_OF_WEEK;
		@@ -714,8 +714,8 @@ discard block
		block discarded – undo
714	714	}
715	715
716	716	/**
717		- * Returns the value for the next minute
718		- *
	717	+ * Returns the value for the next minute
	718	+ *
719	719	* @param string $format return value format ['int'\|'timestamp'\|'object'\|'array']
720	720	*
721	721	* @return int e.g. 25 or timestamp
		@@ -748,8 +748,8 @@ discard block
		block discarded – undo
748	748	/**
749	749	* Returns the value for this second
750	750	*
751		- * @param string $format return value format ['int'\|'timestamp'\|'object'\|'array']
752		- *
	751	+ * @param string $format return value format ['int'\|'timestamp'\|'object'\|'array']
	752	+ *
753	753	* @return int e.g. 44 or timestamp
754	754	* @access public
755	755	*/

		@@ -54,9 +54,9 @@ discard block
		block discarded – undo
54	54	/**
55	55	* Define Calendar Month states
56	56	*/
57		-define('CALENDAR_USE_MONTH', 1);
	57	+define('CALENDAR_USE_MONTH', 1);
58	58	define('CALENDAR_USE_MONTH_WEEKDAYS', 2);
59		-define('CALENDAR_USE_MONTH_WEEKS', 3);
	59	+define('CALENDAR_USE_MONTH_WEEKS', 3);
60	60
61	61	/**
62	62	* Contains a factory method to return a Singleton instance of a class
		@@ -311,7 +311,7 @@ discard block
		block discarded – undo
311	311	* @return array
312	312	* @access public
313	313	*/
314		- function toArray($stamp=null)
	314	+ function toArray($stamp = null)
315	315	{
316	316	if (is_null($stamp)) {
317	317	$stamp = $this->getTimeStamp();
		@@ -503,7 +503,7 @@ discard block
		block discarded – undo
503	503	$this->thisDay()
504	504	);
505	505	}
506		- define ('CALENDAR_FIRST_DAY_OF_WEEK', $firstDay);
	506	+ define('CALENDAR_FIRST_DAY_OF_WEEK', $firstDay);
507	507	return CALENDAR_FIRST_DAY_OF_WEEK;
508	508	}
509	509
		@@ -517,8 +517,8 @@ discard block
		block discarded – undo
517	517	*/
518	518	function prevYear($format = 'int')
519	519	{
520		- $ts = $this->cE->dateToStamp($this->year-1, 1, 1, 0, 0, 0);
521		- return $this->returnValue('Year', $format, $ts, $this->year-1);
	520	+ $ts = $this->cE->dateToStamp($this->year - 1, 1, 1, 0, 0, 0);
	521	+ return $this->returnValue('Year', $format, $ts, $this->year - 1);
522	522	}
523	523
524	524	/**
		@@ -545,8 +545,8 @@ discard block
		block discarded – undo
545	545	*/
546	546	function nextYear($format = 'int')
547	547	{
548		- $ts = $this->cE->dateToStamp($this->year+1, 1, 1, 0, 0, 0);
549		- return $this->returnValue('Year', $format, $ts, $this->year+1);
	548	+ $ts = $this->cE->dateToStamp($this->year + 1, 1, 1, 0, 0, 0);
	549	+ return $this->returnValue('Year', $format, $ts, $this->year + 1);
550	550	}
551	551
552	552	/**
		@@ -559,7 +559,7 @@ discard block
		block discarded – undo
559	559	*/
560	560	function prevMonth($format = 'int')
561	561	{
562		- $ts = $this->cE->dateToStamp($this->year, $this->month-1, 1, 0, 0, 0);
	562	+ $ts = $this->cE->dateToStamp($this->year, $this->month - 1, 1, 0, 0, 0);
563	563	return $this->returnValue('Month', $format, $ts, $this->cE->stampToMonth($ts));
564	564	}
565	565
		@@ -587,7 +587,7 @@ discard block
		block discarded – undo
587	587	*/
588	588	function nextMonth($format = 'int')
589	589	{
590		- $ts = $this->cE->dateToStamp($this->year, $this->month+1, 1, 0, 0, 0);
	590	+ $ts = $this->cE->dateToStamp($this->year, $this->month + 1, 1, 0, 0, 0);
591	591	return $this->returnValue('Month', $format, $ts, $this->cE->stampToMonth($ts));
592	592	}
593	593
		@@ -602,7 +602,7 @@ discard block
		block discarded – undo
602	602	function prevDay($format = 'int')
603	603	{
604	604	$ts = $this->cE->dateToStamp(
605		- $this->year, $this->month, $this->day-1, 0, 0, 0);
	605	+ $this->year, $this->month, $this->day - 1, 0, 0, 0);
606	606	return $this->returnValue('Day', $format, $ts, $this->cE->stampToDay($ts));
607	607	}
608	608
		@@ -632,7 +632,7 @@ discard block
		block discarded – undo
632	632	function nextDay($format = 'int')
633	633	{
634	634	$ts = $this->cE->dateToStamp(
635		- $this->year, $this->month, $this->day+1, 0, 0, 0);
	635	+ $this->year, $this->month, $this->day + 1, 0, 0, 0);
636	636	return $this->returnValue('Day', $format, $ts, $this->cE->stampToDay($ts));
637	637	}
638	638
		@@ -647,7 +647,7 @@ discard block
		block discarded – undo
647	647	function prevHour($format = 'int')
648	648	{
649	649	$ts = $this->cE->dateToStamp(
650		- $this->year, $this->month, $this->day, $this->hour-1, 0, 0);
	650	+ $this->year, $this->month, $this->day, $this->hour - 1, 0, 0);
651	651	return $this->returnValue('Hour', $format, $ts, $this->cE->stampToHour($ts));
652	652	}
653	653
		@@ -677,7 +677,7 @@ discard block
		block discarded – undo
677	677	function nextHour($format = 'int')
678	678	{
679	679	$ts = $this->cE->dateToStamp(
680		- $this->year, $this->month, $this->day, $this->hour+1, 0, 0);
	680	+ $this->year, $this->month, $this->day, $this->hour + 1, 0, 0);
681	681	return $this->returnValue('Hour', $format, $ts, $this->cE->stampToHour($ts));
682	682	}
683	683
		@@ -693,7 +693,7 @@ discard block
		block discarded – undo
693	693	{
694	694	$ts = $this->cE->dateToStamp(
695	695	$this->year, $this->month, $this->day,
696		- $this->hour, $this->minute-1, 0);
	696	+ $this->hour, $this->minute - 1, 0);
697	697	return $this->returnValue('Minute', $format, $ts, $this->cE->stampToMinute($ts));
698	698	}
699	699
		@@ -725,7 +725,7 @@ discard block
		block discarded – undo
725	725	{
726	726	$ts = $this->cE->dateToStamp(
727	727	$this->year, $this->month, $this->day,
728		- $this->hour, $this->minute+1, 0);
	728	+ $this->hour, $this->minute + 1, 0);
729	729	return $this->returnValue('Minute', $format, $ts, $this->cE->stampToMinute($ts));
730	730	}
731	731
		@@ -741,7 +741,7 @@ discard block
		block discarded – undo
741	741	{
742	742	$ts = $this->cE->dateToStamp(
743	743	$this->year, $this->month, $this->day,
744		- $this->hour, $this->minute, $this->second-1);
	744	+ $this->hour, $this->minute, $this->second - 1);
745	745	return $this->returnValue('Second', $format, $ts, $this->cE->stampToSecond($ts));
746	746	}
747	747
		@@ -773,7 +773,7 @@ discard block
		block discarded – undo
773	773	{
774	774	$ts = $this->cE->dateToStamp(
775	775	$this->year, $this->month, $this->day,
776		- $this->hour, $this->minute, $this->second+1);
	776	+ $this->hour, $this->minute, $this->second + 1);
777	777	return $this->returnValue('Second', $format, $ts, $this->cE->stampToSecond($ts));
778	778	}
779	779	}

		@@ -240,7 +240,7 @@ discard block
		block discarded – undo
240	240	* @return void
241	241	* @access private
242	242	*/
243		- function setEmpty ($state = true)
	243	+ function setEmpty($state = true)
244	244	{
245	245	if (method_exists($this->calendar, 'setEmpty')) {
246	246	$this->calendar->setEmpty($state);
		@@ -435,7 +435,7 @@ discard block
		block discarded – undo
435	435	*/
436	436	function prevWeek($format = 'n_in_month')
437	437	{
438		- if ( method_exists($this->calendar, 'prevWeek')) {
	438	+ if (method_exists($this->calendar, 'prevWeek')) {
439	439	return $this->calendar->prevWeek($format);
440	440	} else {
441	441	include_once 'PEAR.php';
		@@ -457,7 +457,7 @@ discard block
		block discarded – undo
457	457	*/
458	458	function thisWeek($format = 'n_in_month')
459	459	{
460		- if ( method_exists($this->calendar, 'thisWeek')) {
	460	+ if (method_exists($this->calendar, 'thisWeek')) {
461	461	return $this->calendar->thisWeek($format);
462	462	} else {
463	463	include_once 'PEAR.php';
		@@ -479,7 +479,7 @@ discard block
		block discarded – undo
479	479	*/
480	480	function nextWeek($format = 'n_in_month')
481	481	{
482		- if ( method_exists($this->calendar, 'nextWeek')) {
	482	+ if (method_exists($this->calendar, 'nextWeek')) {
483	483	return $this->calendar->nextWeek($format);
484	484	} else {
485	485	include_once 'PEAR.php';

		@@ -204,7 +204,7 @@ discard block
		block discarded – undo
204	204	'Hour', $h, CALENDAR_VALUE_TOOSMALL.$min);
205	205	return false;
206	206	}
207		- $max = ($this->cE->getHoursInDay($this->calendar->thisDay())-1);
	207	+ $max = ($this->cE->getHoursInDay($this->calendar->thisDay()) - 1);
208	208	if ($h > $max) {
209	209	$this->errors[] = new Calendar_Validation_Error(
210	210	'Hour', $h, CALENDAR_VALUE_TOOLARGE.$max);
		@@ -228,7 +228,7 @@ discard block
		block discarded – undo
228	228	'Minute', $i, CALENDAR_VALUE_TOOSMALL.$min);
229	229	return false;
230	230	}
231		- $max = ($this->cE->getMinutesInHour($this->calendar->thisHour())-1);
	231	+ $max = ($this->cE->getMinutesInHour($this->calendar->thisHour()) - 1);
232	232	if ($i > $max) {
233	233	$this->errors[] = new Calendar_Validation_Error(
234	234	'Minute', $i, CALENDAR_VALUE_TOOLARGE.$max);
		@@ -252,7 +252,7 @@ discard block
		block discarded – undo
252	252	'Second', $s, CALENDAR_VALUE_TOOSMALL.$min);
253	253	return false;
254	254	}
255		- $max = ($this->cE->getSecondsInMinute($this->calendar->thisMinute())-1);
	255	+ $max = ($this->cE->getSecondsInMinute($this->calendar->thisMinute()) - 1);
256	256	if ($s > $max) {
257	257	$this->errors[] = new Calendar_Validation_Error(
258	258	'Second', $s, CALENDAR_VALUE_TOOLARGE.$max);
		@@ -369,7 +369,7 @@ discard block
		block discarded – undo
369	369	* @return string
370	370	* @access public
371	371	*/
372		- function toString ()
	372	+ function toString()
373	373	{
374	374	return $this->unit.' = '.$this->value.' ['.$this->message.']';
375	375	}

		@@ -14,18 +14,18 @@
		block discarded – undo
14	14	// Build the month
15	15	$Calendar = new Calendar_Month_Weekdays($_GET['jahr'], $_GET['monat']);
16	16
17		-echo ( '<p>The current month is '
	17	+echo ('<p>The current month is '
18	18	.$Calendar->thisMonth().' of year '.$Calendar->thisYear().'</p>');
19	19
20	20	$Uri = & new Calendar_Decorator_Uri($Calendar);
21		-$Uri->setFragments('jahr','monat');
	21	+$Uri->setFragments('jahr', 'monat');
22	22	// $Uri->setSeperator('/'); // Default is &
23	23	// $Uri->setScalar(); // Omit variable names
24		-echo ( "<pre>Previous Uri:\t".$Uri->prev('month')."\n" );
25		-echo ( "This Uri:\t".$Uri->this('month')."\n" );
26		-echo ( "Next Uri:\t".$Uri->next('month')."\n</pre>" );
	24	+echo ("<pre>Previous Uri:\t".$Uri->prev('month')."\n");
	25	+echo ("This Uri:\t".$Uri->this('month')."\n");
	26	+echo ("Next Uri:\t".$Uri->next('month')."\n</pre>");
27	27	?>
28	28	<p>
29		-<a href="<?php echo($_SERVER['PHP_SELF'].'?'.$Uri->prev('month'));?>">Prev</a> :
30		-<a href="<?php echo($_SERVER['PHP_SELF'].'?'.$Uri->next('month'));?>">Next</a>
	29	+<a href="<?php echo($_SERVER['PHP_SELF'].'?'.$Uri->prev('month')); ?>">Prev</a> :
	30	+<a href="<?php echo($_SERVER['PHP_SELF'].'?'.$Uri->next('month')); ?>">Next</a>
31	31	</p>
32	32	\ No newline at end of file

		@@ -8,8 +8,12 @@
		block discarded – undo
8	8	require_once CALENDAR_ROOT.'Month/Weekdays.php';
9	9	require_once CALENDAR_ROOT.'Decorator/Uri.php';
10	10
11		-if (!isset($_GET['jahr'])) $_GET['jahr'] = date('Y');
12		-if (!isset($_GET['monat'])) $_GET['monat'] = date('m');
	11	+if (!isset($_GET['jahr'])) {
	12	+ $_GET['jahr'] = date('Y');
	13	+}
	14	+if (!isset($_GET['monat'])) {
	15	+ $_GET['monat'] = date('m');
	16	+}
13	17
14	18	// Build the month
15	19	$Calendar = new Calendar_Month_Weekdays($_GET['jahr'], $_GET['monat']);

		@@ -3,8 +3,8 @@ discard block
		block discarded – undo
3	3	* Description: demonstrates a decorator used to "attach a payload" to a selection
4	4	* to make it available when iterating over calendar children
5	5	*/
6		-if ( !@include 'Calendar/Calendar.php' ) {
7		- define('CALENDAR_ROOT','../../');
	6	+if (!@include 'Calendar/Calendar.php') {
	7	+ define('CALENDAR_ROOT', '../../');
8	8	}
9	9	require_once CALENDAR_ROOT.'Day.php';
10	10	require_once CALENDAR_ROOT.'Hour.php';
		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25	}
26	26
27	27	// Create a day to view the hours for
28		-$Day = & new Calendar_Day(2003,10,24);
	28	+$Day = & new Calendar_Day(2003, 10, 24);
29	29
30	30	// A sample query to get the data for today (NOT ACTUALLY USED HERE)
31	31	$sql = "
		@@ -39,18 +39,18 @@ discard block
		block discarded – undo
39	39	eventtime < '".$Day->nextDay(TRUE)."';";
40	40
41	41	// An array simulating data from a database
42		-$result = array (
43		- array('eventtime'=>mktime(9,0,0,10,24,2003),'entry'=>'Meeting with sales team'),
44		- array('eventtime'=>mktime(11,0,0,10,24,2003),'entry'=>'Conference call with Widget Inc.'),
45		- array('eventtime'=>mktime(15,0,0,10,24,2003),'entry'=>'Presentation to board of directors')
	42	+$result = array(
	43	+ array('eventtime'=>mktime(9, 0, 0, 10, 24, 2003), 'entry'=>'Meeting with sales team'),
	44	+ array('eventtime'=>mktime(11, 0, 0, 10, 24, 2003), 'entry'=>'Conference call with Widget Inc.'),
	45	+ array('eventtime'=>mktime(15, 0, 0, 10, 24, 2003), 'entry'=>'Presentation to board of directors')
46	46	);
47	47
48	48	// An array to place selected hours in
49	49	$selection = array();
50	50
51	51	// Loop through the "database result"
52		-foreach ( $result as $row ) {
53		- $Hour = new Calendar_Hour(2000,1,1,1); // Create Hour with dummy values
	52	+foreach ($result as $row) {
	53	+ $Hour = new Calendar_Hour(2000, 1, 1, 1); // Create Hour with dummy values
54	54	$Hour->setTimeStamp($row['eventtime']); // Set the real time with setTimeStamp
55	55
56	56	// Create the decorator, passing it the Hour
		@@ -74,36 +74,36 @@ discard block
		block discarded – undo
74	74	<body>
75	75	<h1>Passing a Selection "Payload" using a Decorator</h1>
76	76	<table>
77		-<caption><b>Your Schedule for <?php echo ( date('D nS F Y',$Day->thisDay(TRUE)) ); ?></b></caption>
	77	+<caption><b>Your Schedule for <?php echo (date('D nS F Y', $Day->thisDay(TRUE))); ?></b></caption>
78	78	<tr>
79	79	<th width="5%">Time</th>
80	80	<th>Entry</th>
81	81	</tr>
82	82	<?php
83		-while ( $Hour = & $Day->fetch() ) {
	83	+while ($Hour = & $Day->fetch()) {
84	84
85	85	$hour = $Hour->thisHour();
86	86	$minute = $Hour->thisMinute();
87	87
88	88	// Office hours only...
89		- if ( $hour >= 8 && $hour <= 18 ) {
90		- echo ( "<tr>\n" );
91		- echo ( "<td>$hour:$minute</td>\n" );
	89	+ if ($hour >= 8 && $hour <= 18) {
	90	+ echo ("<tr>\n");
	91	+ echo ("<td>$hour:$minute</td>\n");
92	92
93	93	// If the hour is selected, call the decorator method...
94		- if ( $Hour->isSelected() ) {
95		- echo ( "<td bgcolor=\"silver\">".$Hour->getEntry()."</td>\n" );
	94	+ if ($Hour->isSelected()) {
	95	+ echo ("<td bgcolor=\"silver\">".$Hour->getEntry()."</td>\n");
96	96	} else {
97		- echo ( "<td> </td>\n" );
	97	+ echo ("<td> </td>\n");
98	98	}
99		- echo ( "</tr>\n" );
	99	+ echo ("</tr>\n");
100	100	}
101	101	}
102	102	?>
103	103	</table>
104	104	<p>The query to fetch this data, with help from PEAR::Calendar, might be;</p>
105	105	<pre>
106		-<?php echo ( $sql ); ?>
	106	+<?php echo ($sql); ?>
107	107	</pre>
108	108	</body>
109	109	</html>
110	110	\ No newline at end of file

		@@ -25,12 +25,12 @@ discard block
		block discarded – undo
25	25	echo "<hr>Creating: new Calendar_Day(date('Y'), date('n'), date('d'));<br />";
26	26	$Calendar = new Calendar_Day(date('Y'), date('n'), date('d'));
27	27
28		-echo '<hr>Previous month is: '.Calendar_Util_Textual::prevMonthName($Calendar,'two').'<br />';
29		-echo 'This month is: '.Calendar_Util_Textual::thisMonthName($Calendar,'short').'<br />';
	28	+echo '<hr>Previous month is: '.Calendar_Util_Textual::prevMonthName($Calendar, 'two').'<br />';
	29	+echo 'This month is: '.Calendar_Util_Textual::thisMonthName($Calendar, 'short').'<br />';
30	30	echo 'Next month is: '.Calendar_Util_Textual::nextMonthName($Calendar).'<br /><hr />';
31	31	echo 'Previous day is: '.Calendar_Util_Textual::prevDayName($Calendar).'<br />';
32		-echo 'This day is: '.Calendar_Util_Textual::thisDayName($Calendar,'short').'<br />';
33		-echo 'Next day is: '.Calendar_Util_Textual::nextDayName($Calendar,'one').'<br /><hr />';
	32	+echo 'This day is: '.Calendar_Util_Textual::thisDayName($Calendar, 'short').'<br />';
	33	+echo 'Next day is: '.Calendar_Util_Textual::nextDayName($Calendar, 'one').'<br /><hr />';
34	34
35	35	echo "Creating: new Calendar_Month_Weekdays(date('Y'), date('n'), 6); - Saturday is first day of week<br />";
36	36	$Calendar = new Calendar_Month_Weekdays(date('Y'), date('n'), 6);
		@@ -41,7 +41,7 @@ discard block
		block discarded – undo
41	41	<caption><?php echo Calendar_Util_Textual::thisMonthName($Calendar).' '.$Calendar->thisYear(); ?></caption>
42	42	<tr>
43	43	<?php
44		-$dayheaders = Calendar_Util_Textual::orderedWeekdays($Calendar,'short');
	44	+$dayheaders = Calendar_Util_Textual::orderedWeekdays($Calendar, 'short');
45	45	foreach ($dayheaders as $dayheader) {
46	46	echo '<th>'.$dayheader.'</th>';
47	47	}

		@@ -96,12 +96,12 @@ discard block
		block discarded – undo
96	96	$stamp = mktime(0, 0, 0, $i, 1, 2003);
97	97	$month = strftime($formats[$format], $stamp);
98	98	switch($format) {
99		- case 'one':
100		- $month = substr($month, 0, 1);
101		- break;
102		- case 'two':
103		- $month = substr($month, 0, 2);
104		- break;
	99	+ case 'one':
	100	+ $month = substr($month, 0, 1);
	101	+ break;
	102	+ case 'two':
	103	+ $month = substr($month, 0, 2);
	104	+ break;
105	105	}
106	106	$months[$i] = $month;
107	107	}
		@@ -133,12 +133,12 @@ discard block
		block discarded – undo
133	133	$stamp = mktime(0, 0, 0, 11, $i+2, 2003);
134	134	$day = strftime($formats[$format], $stamp);
135	135	switch($format) {
136		- case 'one':
137		- $day = substr($day, 0, 1);
138		- break;
139		- case 'two':
140		- $day = substr($day, 0, 2);
141		- break;
	136	+ case 'one':
	137	+ $day = substr($day, 0, 1);
	138	+ break;
	139	+ case 'two':
	140	+ $day = substr($day, 0, 2);
	141	+ break;
142	142	}
143	143	$days[$i] = $day;
144	144	}

		@@ -80,10 +80,10 @@ discard block
		block discarded – undo
80	80	$format = 'long';
81	81	}
82	82	$months = array();
83		- for ($i=1; $i<=12; $i++) {
	83	+ for ($i = 1; $i <= 12; $i++) {
84	84	$stamp = mktime(0, 0, 0, $i, 1, 2003);
85	85	$month = strftime($formats[$format], $stamp);
86		- switch($format) {
	86	+ switch ($format) {
87	87	case 'one':
88	88	$month = substr($month, 0, 1);
89	89	break;
		@@ -117,10 +117,10 @@ discard block
		block discarded – undo
117	117	$format = 'long';
118	118	}
119	119	$days = array();
120		- for ($i=0; $i<=6; $i++) {
121		- $stamp = mktime(0, 0, 0, 11, $i+2, 2003);
	120	+ for ($i = 0; $i <= 6; $i++) {
	121	+ $stamp = mktime(0, 0, 0, 11, $i + 2, 2003);
122	122	$day = strftime($formats[$format], $stamp);
123		- switch($format) {
	123	+ switch ($format) {
124	124	case 'one':
125	125	$day = substr($day, 0, 1);
126	126	break;
		@@ -212,7 +212,7 @@ discard block
		block discarded – undo
212	212	* @access public
213	213	* @static
214	214	*/
215		- function thisDayName($Calendar, $format='long')
	215	+ function thisDayName($Calendar, $format = 'long')
216	216	{
217	217	$days = Textual::weekdayNames($format);
218	218	$stamp = $Calendar->thisDay('timestamp');
		@@ -231,7 +231,7 @@ discard block
		block discarded – undo
231	231	* @access public
232	232	* @static
233	233	*/
234		- function nextDayName($Calendar, $format='long')
	234	+ function nextDayName($Calendar, $format = 'long')
235	235	{
236	236	$days = Textual::weekdayNames($format);
237	237	$stamp = $Calendar->nextDay('timestamp');
		@@ -264,7 +264,7 @@ discard block
		block discarded – undo
264	264	//check if defined / set
265	265	if (defined('CALENDAR_FIRST_DAY_OF_WEEK')) {
266	266	$firstDay = CALENDAR_FIRST_DAY_OF_WEEK;
267		- } elseif(isset($Calendar->firstDay)) {
	267	+ } elseif (isset($Calendar->firstDay)) {
268	268	$firstDay = $Calendar->firstDay;
269	269	}
270	270	$ordereddays = array();

		@@ -98,7 +98,7 @@ discard block
		block discarded – undo
98	98	*
99	99	* @access public
100	100	*/
101		- function __construct($y, $m=null, $d=null, $h=null, $i=null, $s=null)
	101	+ function __construct($y, $m = null, $d = null, $h = null, $i = null, $s = null)
102	102	{
103	103	$this->setFragments($y, $m, $d, $h, $i, $s);
104	104	}
		@@ -116,7 +116,7 @@ discard block
		block discarded – undo
116	116	* @return void
117	117	* @access public
118	118	*/
119		- function setFragments($y, $m=null, $d=null, $h=null, $i=null, $s=null)
	119	+ function setFragments($y, $m = null, $d = null, $h = null, $i = null, $s = null)
120	120	{
121	121	if (!is_null($y)) $this->uris['Year'] = $y;
122	122	if (!is_null($m)) $this->uris['Month'] = $m;

		@@ -88,13 +88,13 @@ discard block
		block discarded – undo
88	88	{
89	89	static $engine = false;
90	90	switch (CALENDAR_ENGINE) {
91		- case 'PearDate':
92		- $class = 'Calendar_Engine_PearDate';
93		- break;
94		- case 'UnixTS':
95		- default:
96		- $class = 'Pear\Calendar\Engine\UnixTS';
97		- break;
	91	+ case 'PearDate':
	92	+ $class = 'Calendar_Engine_PearDate';
	93	+ break;
	94	+ case 'UnixTS':
	95	+ default:
	96	+ $class = 'Pear\Calendar\Engine\UnixTS';
	97	+ break;
98	98	}
99	99	if (!$engine) {
100	100	if (!class_exists($class)) {
		@@ -341,19 +341,19 @@ discard block
		block discarded – undo
341	341	function returnValue($returnType, $format, $stamp, $default)
342	342	{
343	343	switch (strtolower($format)) {
344		- case 'int':
345		- return $default;
346		- case 'array':
347		- return $this->toArray($stamp);
348		- break;
349		- case 'object':
350		- include_once CALENDAR_ROOT.'Factory.php';
351		- return Factory::createByTimestamp($returnType, $stamp);
352		- break;
353		- case 'timestamp':
354		- default:
355		- return $stamp;
356		- break;
	344	+ case 'int':
	345	+ return $default;
	346	+ case 'array':
	347	+ return $this->toArray($stamp);
	348	+ break;
	349	+ case 'object':
	350	+ include_once CALENDAR_ROOT.'Factory.php';
	351	+ return Factory::createByTimestamp($returnType, $stamp);
	352	+ break;
	353	+ case 'timestamp':
	354	+ default:
	355	+ return $stamp;
	356	+ break;
357	357	}
358	358	}
359	359

		@@ -393,7 +393,7 @@ discard block
		block discarded – undo
393	393	*
394	394	* @return int e.g. 4 or Unix timestamp
395	395	* @access public
396		- */
	396	+ */
397	397	function prevMonth($format = 'int')
398	398	{
399	399	return $this->calendar->prevMonth($format);
		@@ -432,7 +432,7 @@ discard block
		block discarded – undo
432	432	*
433	433	* @return int e.g. 4 or Unix timestamp
434	434	* @access public
435		- */
	435	+ */
436	436	function prevWeek($format = 'n_in_month')
437	437	{
438	438	if ( method_exists($this->calendar, 'prevWeek')) {

		@@ -114,7 +114,7 @@ discard block
		block discarded – undo
114	114	*
115	115	* @access protected
116	116	*/
117		- function __construct(& $calendar, $firstDay=null)
	117	+ function __construct(& $calendar, $firstDay = null)
118	118	{
119	119	$this->calendar = & $calendar;
120	120	$this->cE = & $calendar->getEngine();
		@@ -172,7 +172,7 @@ discard block
		block discarded – undo
172	172	$this->calendar->thisYear(), $this->calendar->thisMonth());
173	173	$firstDayInMonth = $this->cE->getFirstDayInMonth(
174	174	$this->calendar->thisYear(), $this->calendar->thisMonth());
175		- $this->emptyBefore=0;
	175	+ $this->emptyBefore = 0;
176	176	foreach ($this->daysOfMonth as $dayOfWeek) {
177	177	if ($firstDayInMonth == $dayOfWeek) {
178	178	break;
		@@ -188,7 +188,7 @@ discard block
		block discarded – undo
188	188	$this->calendar->thisDay()
189	189	)
190	190	);
191		- for ($i=1; $i < $this->numWeeks; $i++) {
	191	+ for ($i = 1; $i < $this->numWeeks; $i++) {
192	192	$this->daysOfMonth =
193	193	array_merge($this->daysOfMonth, $this->daysOfWeek);
194	194	}
		@@ -283,7 +283,7 @@ discard block
		block discarded – undo
283	283	$this->calendar->thisYear(),
284	284	$this->calendar->thisMonth(),
285	285	$this->calendar->thisDay()
286		- ) * ($this->numWeeks-1));
	286	+ ) * ($this->numWeeks - 1));
287	287	}
288	288
289	289	/**
		@@ -296,7 +296,7 @@ discard block
		block discarded – undo
296	296	*
297	297	* @return int timestamp
298	298	*/
299		- function getWeekStart($y, $m, $d, $firstDay=1)
	299	+ function getWeekStart($y, $m, $d, $firstDay = 1)
300	300	{
301	301	$dow = $this->cE->getDayOfWeek($y, $m, $d);
302	302	if ($dow > $firstDay) {

FriendsOfPear / Calendar

Pull Request — master (#2)

Status

Category

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Switch Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Braces +18 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

Switch Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch