Inspection of "Update composer.json" - FriendsOfPear/Calendar - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 366f02...5534ff )

by tsms

created 2019-03-11 12:28 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.

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/Week.php 1 patch

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

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

Please login to merge, or discard this patch.

Calendar/Hour.php 1 patch

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

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

Please login to merge, or discard this patch.

Calendar/Util/Textual.php 1 patch

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

@@ -92,10 +92,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;
@@ -129,10 +129,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;
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
      * @access public
      * @static
      */
-    function thisDayName($Calendar, $format='long')
+    function thisDayName($Calendar, $format = 'long')
     {
         $days = Calendar_Util_Textual::weekdayNames($format);
         include_once 'Date/Calc.php';
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
      * @access public
      * @static
      */
-    function nextDayName($Calendar, $format='long')
+    function nextDayName($Calendar, $format = 'long')
     {
         $days = Calendar_Util_Textual::weekdayNames($format);
         $stamp = $Calendar->nextDay('timestamp');
@@ -279,7 +279,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/Calendar.php 1 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.

Calendar/Day.php 1 patch

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

@@ -118,7 +118,7 @@  discard block
 block discarded – undo
         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 Calendar_Hour($this->year, $this->month, $this->day, $i);
         }
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
      * @return void
      * @access private
      */
-    function setEmpty ($state = true)
+    function setEmpty($state = true)
     {
         $this->empty = $state;
     }

Please login to merge, or discard this patch.

Calendar/Engine/Interface.php 1 patch

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

@@ -186,7 +186,7 @@  discard block
 block discarded – undo
      * @return int (e.g. 12)
      * @access protected
      */
-    function getMonthsInYear($y=null)
+    function getMonthsInYear($y = null)
     {
     }
 
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
      * @return int
      * @access protected
      */
-    function getFirstDayInMonth ($y, $m)
+    function getFirstDayInMonth($y, $m)
     {
     }
 
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
      * @return int (e.g. 7)
      * @access protected
      */
-    function getDaysInWeek($y=null, $m=null, $d=null)
+    function getDaysInWeek($y = null, $m = null, $d = null)
     {
     }
 
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
      * @return int week number
      * @access protected
      */
-    function getWeekNInMonth($y, $m, $d, $firstDay=1)
+    function getWeekNInMonth($y, $m, $d, $firstDay = 1)
     {
     }
 
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
      * @return array list of numeric values of days in week, beginning 0
      * @access protected
      */
-    function getWeekDays($y=null, $m=null, $d=null)
+    function getWeekDays($y = null, $m = null, $d = null)
     {
     }
 
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
      * @see getWeekDays
      * @access protected
      */
-    function getFirstDayOfWeek($y=null, $m=null, $d=null)
+    function getFirstDayOfWeek($y = null, $m = null, $d = null)
     {
     }
 
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
      * @return int (e.g. 24)
      * @access protected
      */
-    function getHoursInDay($y=null,$m=null,$d=null)
+    function getHoursInDay($y = null, $m = null, $d = null)
     {
     }
 
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
      * @return int
      * @access protected
      */
-    function getMinutesInHour($y=null,$m=null,$d=null,$h=null)
+    function getMinutesInHour($y = null, $m = null, $d = null, $h = null)
     {
     }
 
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
      * @return int
      * @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)
     {
     }
 

Please login to merge, or discard this patch.

		@@ -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	}

		@@ -118,7 +118,7 @@ discard block
		block discarded – undo
118	118	include_once CALENDAR_ROOT.'Hour.php';
119	119
120	120	$hID = $this->cE->getHoursInDay($this->year, $this->month, $this->day);
121		- for ($i=0; $i < $hID; $i++) {
	121	+ for ($i = 0; $i < $hID; $i++) {
122	122	$this->children[$i] =
123	123	new Calendar_Hour($this->year, $this->month, $this->day, $i);
124	124	}
		@@ -213,7 +213,7 @@ discard block
		block discarded – undo
213	213	* @return void
214	214	* @access private
215	215	*/
216		- function setEmpty ($state = true)
	216	+ function setEmpty($state = true)
217	217	{
218	218	$this->empty = $state;
219	219	}

		@@ -186,7 +186,7 @@ discard block
		block discarded – undo
186	186	* @return int (e.g. 12)
187	187	* @access protected
188	188	*/
189		- function getMonthsInYear($y=null)
	189	+ function getMonthsInYear($y = null)
190	190	{
191	191	}
192	192
		@@ -213,7 +213,7 @@ discard block
		block discarded – undo
213	213	* @return int
214	214	* @access protected
215	215	*/
216		- function getFirstDayInMonth ($y, $m)
	216	+ function getFirstDayInMonth($y, $m)
217	217	{
218	218	}
219	219
		@@ -227,7 +227,7 @@ discard block
		block discarded – undo
227	227	* @return int (e.g. 7)
228	228	* @access protected
229	229	*/
230		- function getDaysInWeek($y=null, $m=null, $d=null)
	230	+ function getDaysInWeek($y = null, $m = null, $d = null)
231	231	{
232	232	}
233	233
		@@ -256,7 +256,7 @@ discard block
		block discarded – undo
256	256	* @return int week number
257	257	* @access protected
258	258	*/
259		- function getWeekNInMonth($y, $m, $d, $firstDay=1)
	259	+ function getWeekNInMonth($y, $m, $d, $firstDay = 1)
260	260	{
261	261	}
262	262
		@@ -297,7 +297,7 @@ discard block
		block discarded – undo
297	297	* @return array list of numeric values of days in week, beginning 0
298	298	* @access protected
299	299	*/
300		- function getWeekDays($y=null, $m=null, $d=null)
	300	+ function getWeekDays($y = null, $m = null, $d = null)
301	301	{
302	302	}
303	303
		@@ -313,7 +313,7 @@ discard block
		block discarded – undo
313	313	* @see getWeekDays
314	314	* @access protected
315	315	*/
316		- function getFirstDayOfWeek($y=null, $m=null, $d=null)
	316	+ function getFirstDayOfWeek($y = null, $m = null, $d = null)
317	317	{
318	318	}
319	319
		@@ -327,7 +327,7 @@ discard block
		block discarded – undo
327	327	* @return int (e.g. 24)
328	328	* @access protected
329	329	*/
330		- function getHoursInDay($y=null,$m=null,$d=null)
	330	+ function getHoursInDay($y = null, $m = null, $d = null)
331	331	{
332	332	}
333	333
		@@ -342,7 +342,7 @@ discard block
		block discarded – undo
342	342	* @return int
343	343	* @access protected
344	344	*/
345		- function getMinutesInHour($y=null,$m=null,$d=null,$h=null)
	345	+ function getMinutesInHour($y = null, $m = null, $d = null, $h = null)
346	346	{
347	347	}
348	348
		@@ -358,7 +358,7 @@ discard block
		block discarded – undo
358	358	* @return int
359	359	* @access protected
360	360	*/
361		- function getSecondsInMinute($y=null,$m=null,$d=null,$h=null,$i=null)
	361	+ function getSecondsInMinute($y = null, $m = null, $d = null, $h = null, $i = null)
362	362	{
363	363	}
364	364

		@@ -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

		@@ -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	}

		@@ -221,7 +221,7 @@ discard block
		block discarded – undo
221	221	$this->thisDay()
222	222	);
223	223
224		- for ($i=1; $i <= $end; $i++) {
	224	+ for ($i = 1; $i <= $end; $i++) {
225	225	$stamp = $this->cE->dateToStamp($year, $month, $day++);
226	226	$this->children[$i] = new Calendar_Day(
227	227	$this->cE->stampToYear($stamp),
		@@ -233,13 +233,13 @@ discard block
		block discarded – undo
233	233	//set empty days (@see Calendar_Month_Weeks::build())
234	234	if ($this->firstWeek) {
235	235	$eBefore = $this->tableHelper->getEmptyDaysBefore();
236		- for ($i=1; $i <= $eBefore; $i++) {
	236	+ for ($i = 1; $i <= $eBefore; $i++) {
237	237	$this->children[$i]->setEmpty();
238	238	}
239	239	}
240	240	if ($this->lastWeek) {
241	241	$eAfter = $this->tableHelper->getEmptyDaysAfterOffset();
242		- for ($i = $eAfter+1; $i <= $end; $i++) {
	242	+ for ($i = $eAfter + 1; $i <= $end; $i++) {
243	243	$this->children[$i]->setEmpty();
244	244	}
245	245	}
		@@ -346,7 +346,7 @@ discard block
		block discarded – undo
346	346	switch (strtolower($format)) {
347	347	case 'int':
348	348	case 'n_in_month':
349		- return ($this->firstWeek) ? null : $this->thisWeek('n_in_month') -1;
	349	+ return ($this->firstWeek) ? null : $this->thisWeek('n_in_month') - 1;
350	350	case 'n_in_year':
351	351	return $this->cE->getWeekNInYear(
352	352	$this->cE->stampToYear($this->prevWeek),
		@@ -419,7 +419,7 @@ discard block
		block discarded – undo
419	419	switch (strtolower($format)) {
420	420	case 'int':
421	421	case 'n_in_month':
422		- return ($this->lastWeek) ? null : $this->thisWeek('n_in_month') +1;
	422	+ return ($this->lastWeek) ? null : $this->thisWeek('n_in_month') + 1;
423	423	case 'n_in_year':
424	424	return $this->cE->getWeekNInYear(
425	425	$this->cE->stampToYear($this->nextWeek),

		@@ -98,7 +98,7 @@
		block discarded – undo
98	98	include_once CALENDAR_ROOT.'Minute.php';
99	99	$mIH = $this->cE->getMinutesInHour($this->year, $this->month, $this->day,
100	100	$this->hour);
101		- for ($i=0; $i < $mIH; $i++) {
	101	+ for ($i = 0; $i < $mIH; $i++) {
102	102	$this->children[$i] =
103	103	new Calendar_Minute($this->year, $this->month, $this->day,
104	104	$this->hour, $i);

		@@ -92,10 +92,10 @@ discard block
		block discarded – undo
92	92	$format = 'long';
93	93	}
94	94	$months = array();
95		- for ($i=1; $i<=12; $i++) {
	95	+ for ($i = 1; $i <= 12; $i++) {
96	96	$stamp = mktime(0, 0, 0, $i, 1, 2003);
97	97	$month = strftime($formats[$format], $stamp);
98		- switch($format) {
	98	+ switch ($format) {
99	99	case 'one':
100	100	$month = substr($month, 0, 1);
101	101	break;
		@@ -129,10 +129,10 @@ discard block
		block discarded – undo
129	129	$format = 'long';
130	130	}
131	131	$days = array();
132		- for ($i=0; $i<=6; $i++) {
133		- $stamp = mktime(0, 0, 0, 11, $i+2, 2003);
	132	+ for ($i = 0; $i <= 6; $i++) {
	133	+ $stamp = mktime(0, 0, 0, 11, $i + 2, 2003);
134	134	$day = strftime($formats[$format], $stamp);
135		- switch($format) {
	135	+ switch ($format) {
136	136	case 'one':
137	137	$day = substr($day, 0, 1);
138	138	break;
		@@ -226,7 +226,7 @@ discard block
		block discarded – undo
226	226	* @access public
227	227	* @static
228	228	*/
229		- function thisDayName($Calendar, $format='long')
	229	+ function thisDayName($Calendar, $format = 'long')
230	230	{
231	231	$days = Calendar_Util_Textual::weekdayNames($format);
232	232	include_once 'Date/Calc.php';
		@@ -244,7 +244,7 @@ discard block
		block discarded – undo
244	244	* @access public
245	245	* @static
246	246	*/
247		- function nextDayName($Calendar, $format='long')
	247	+ function nextDayName($Calendar, $format = 'long')
248	248	{
249	249	$days = Calendar_Util_Textual::weekdayNames($format);
250	250	$stamp = $Calendar->nextDay('timestamp');
		@@ -279,7 +279,7 @@ discard block
		block discarded – undo
279	279	//check if defined / set
280	280	if (defined('CALENDAR_FIRST_DAY_OF_WEEK')) {
281	281	$firstDay = CALENDAR_FIRST_DAY_OF_WEEK;
282		- } elseif(isset($Calendar->firstDay)) {
	282	+ } elseif (isset($Calendar->firstDay)) {
283	283	$firstDay = $Calendar->firstDay;
284	284	}
285	285	$ordereddays = array();

FriendsOfPear / Calendar

Push — master ( 366f02...5534ff )

Status

Category

Spacing +7 added lines, -7 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

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

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

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

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

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

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