Inspection of "Fix DayOf year class with new structure" - opencafe/datium - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 13abb0...106f43 )

by mehdi

created 2015-12-11 22:42 UTC

Status

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

@@ -8,7 +8,7 @@  discard block
 block discarded – undo
   /**
    * @param integer store year value
    */
-	protected $year;
+  protected $year;
 
   /**
    * @param string store type of year value
@@ -25,15 +25,15 @@  discard block
 block discarded – undo
    * @param $year integer
    * @since Aug, 21 2015
    */
-	public function __construct( $year, $type = 'gregorian' ) {
+  public function __construct( $year, $type = 'gregorian' ) {
 
-			$this->year = $year;
+      $this->year = $year;
 
       $this->type = $type;
 
       return $this;
 
-	}
+  }
 
   /**
    * check the gregorian year is leap or not
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
    */
   public function shamsiLeapYear() {
 
-		$shamsi_years = 0;
+    $shamsi_years = 0;
 
     while ( $shamsi_years < ( $this->year - 128 ) ) {
 
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
 
     $this->result = $this->result % 33;
 
-   }
+    }
 
     if ( ( $this->result == 28 ) || ( $this->result == 27 ) ) {
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
 
     $this->result = $this->result % 33;
 
-   }
+    }
 
     if ( ( ( $this->result % 4 ) == 0 ) && ( $this->result != 28 ) ) {
 
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
 
        $this->result = $this->shamsiLeapYear();
 
-       break;
+        break;
 
       case 'ghamari':
 

Please login to merge, or discard this patch.

src/CalendarSettings/Ghamari.php 1 patch

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

@@ -1,8 +1,8 @@  discard block
 block discarded – undo
 <?php
 
- return array (
+  return array (
 
- /************************************************************
+  /************************************************************
   *                        Convert to
   ************************************************************
   *
@@ -10,85 +10,85 @@  discard block
 block discarded – undo
   *
   *\_________________________________________________________/
   */
-   'convert_to' => function( $date_time ) {
+    'convert_to' => function( $date_time ) {
 
-     $config = include( 'Shamsi.php' );
+      $config = include( 'Shamsi.php' );
 
-     $date_time = Datium\Datium::create( $date_time )->to( 'shamsi' )->object();
+      $date_time = Datium\Datium::create( $date_time )->to( 'shamsi' )->object();
 
-     $year = $date_time->format('Y');
+      $year = $date_time->format('Y');
 
-     $month = $date_time->format('n');
+      $month = $date_time->format('n');
 
-     $day = $date_time->format('d');
+      $day = $date_time->format('d');
 
-     $temp_day = 0 ;
+      $temp_day = 0 ;
 
-     for ( $i = 1 ; $i < $month ; $i++ ) {
+      for ( $i = 1 ; $i < $month ; $i++ ) {
 
-         $temp_day += $config[ 'month_days_number' ][ $i ];
+          $temp_day += $config[ 'month_days_number' ][ $i ];
 
-       }
+        }
 
       $temp_day += $day;
 
       $leap = new Datium\Tools\Leap( $year );
 
-     if( $leap->get() && $month > 11 ) $temp_day++;
+      if( $leap->get() && $month > 11 ) $temp_day++;
 
-     $_year = ( ( ( ( ( $year - 1 ) * 365.2422 ) + $temp_day ) - 119) / 354.3670 ) + 1;
+      $_year = ( ( ( ( ( $year - 1 ) * 365.2422 ) + $temp_day ) - 119) / 354.3670 ) + 1;
 
-     $_year = explode( '.', $_year );
+      $_year = explode( '.', $_year );
 
-     $year = $_year[0];
+      $year = $_year[0];
 
-     $_month = $_year[1];
+      $_month = $_year[1];
 
       $var_temp = '0.0';
 
-       for ( $i = strlen( $_month ); $i > 2; $i-- ) {
+        for ( $i = strlen( $_month ); $i > 2; $i-- ) {
 
-         $var_temp .= '0';
+          $var_temp .= '0';
 
       }
 
       $var_temp .= '1';
 
-     $_month = $_month * $var_temp ;
+      $_month = $_month * $var_temp ;
 
-     $_month = ( $_month * 12 ) + 1;
+      $_month = ( $_month * 12 ) + 1;
 
-     $_month = explode( '.', $_month );
+      $_month = explode( '.', $_month );
 
-     $month = $_month[0];
+      $month = $_month[0];
 
-     $_day = $_month[1];
+      $_day = $_month[1];
 
-     $var_temp = '0.0';
+      $var_temp = '0.0';
 
-     for ( $i = strlen( $_day );  $i > 2;  $i-- ) {
+      for ( $i = strlen( $_day );  $i > 2;  $i-- ) {
 
         $var_temp .= '0' ;
 
-     }
+      }
 
-     $var_temp .= '1';
+      $var_temp .= '1';
 
-     $_day = $_day * $var_temp;
+      $_day = $_day * $var_temp;
 
-     $_day = ( $_day * 29.530 );
+      $_day = ( $_day * 29.530 );
 
-     $_day = explode( '.', $_day );
+      $_day = explode( '.', $_day );
 
-     $day = $_day[0];
+      $day = $_day[0];
 
     $date_time->setDate( $year, $month, $day );
 
     return $date_time;
 
-   },
+    },
 
-   /************************************************************
+    /************************************************************
     *                        Convert From
     ************************************************************
     *
@@ -96,62 +96,62 @@  discard block
 block discarded – undo
     *
     *\_________________________________________________________/
     */
-   'convert_from' => function( $date_time ) {
+    'convert_from' => function( $date_time ) {
 
-     $config = include('Ghamari.php');
+      $config = include('Ghamari.php');
 
-     $year = $date_time->format('Y');
+      $year = $date_time->format('Y');
 
-     $month = $date_time->format('m');
+      $month = $date_time->format('m');
 
-     $day = $date_time->format('d');
+      $day = $date_time->format('d');
 
-     $days_of_year = 0;
+      $days_of_year = 0;
 
-     foreach ( $config['month_days_number'] as $month => $value ) {
+      foreach ( $config['month_days_number'] as $month => $value ) {
 
-       if( $month > $month ) $days_of_year += $value;
+        if( $month > $month ) $days_of_year += $value;
 
-     }
+      }
 
-     $days_of_year += $day;
+      $days_of_year += $day;
 
-     $days_of_leap_years =  intval( ( ( $year - 1 ) / 3 )  );
+      $days_of_leap_years =  intval( ( ( $year - 1 ) / 3 )  );
 
-     $days_of_ghamari_years = ( ( ( $year - 1 ) * 354 ) + $days_of_year + $days_of_leap_years );
+      $days_of_ghamari_years = ( ( ( $year - 1 ) * 354 ) + $days_of_year + $days_of_leap_years );
 
-     $days_of_gregorain_years = $days_of_ghamari_years + 227078;
+      $days_of_gregorain_years = $days_of_ghamari_years + 227078;
 
-     $days_of_gregorain_years = $days_of_gregorain_years - intval( ( ( $year + 578 ) / 4 ) );
+      $days_of_gregorain_years = $days_of_gregorain_years - intval( ( ( $year + 578 ) / 4 ) );
 
-     $gregorian_month = ( $days_of_gregorain_years % 365 );
+      $gregorian_month = ( $days_of_gregorain_years % 365 );
 
-     $gregorian_year = intval( $days_of_gregorain_years / 365 ) + 1;
+      $gregorian_year = intval( $days_of_gregorain_years / 365 ) + 1;
 
-     $config = include('Gregorian.php');
+      $config = include('Gregorian.php');
 
-     foreach ($config [ 'month_days_number' ] as $month => $value) {
+      foreach ($config [ 'month_days_number' ] as $month => $value) {
 
-       if ( $gregorian_month < $value ) {
+        if ( $gregorian_month < $value ) {
 
-         break;
-       }
+          break;
+        }
 
-         $gregorian_month -= $value;
-     }
+          $gregorian_month -= $value;
+      }
 
-       $gregorian_day = $gregorian_month;
+        $gregorian_day = $gregorian_month;
 
-       $gregorian_month = $month;
+        $gregorian_month = $month;
 
-       $date_time->setDate( $gregorian_year, $gregorian_month, $gregorian_day );
+        $date_time->setDate( $gregorian_year, $gregorian_month, $gregorian_day );
 
       return $date_time;
 
 
-   },
+    },
 
-   /************************************************************
+    /************************************************************
     *               Shorthand for jalali calendar
     ************************************************************
     *
@@ -159,9 +159,9 @@  discard block
 block discarded – undo
     *
     *\_________________________________________________________/
     */
-   'shorthand' => 'sh',
+    'shorthand' => 'sh',
 
-   /************************************************************
+    /************************************************************
     *                        Month's name
     ************************************************************
     *
@@ -169,35 +169,35 @@  discard block
 block discarded – undo
     *
     *\_________________________________________________________/
     */
-   'month' => array (
+    'month' => array (
 
-     'Farvardin',
+      'Farvardin',
 
-     'Ordibehesht',
+      'Ordibehesht',
 
-     'Khordad',
+      'Khordad',
 
-     'Tir',
+      'Tir',
 
-     'Mordad',
+      'Mordad',
 
-     'Shahrivar',
+      'Shahrivar',
 
-     'Mehr',
+      'Mehr',
 
-     'Aban',
+      'Aban',
 
-     'Azar',
+      'Azar',
 
-     'Dey',
+      'Dey',
 
-     'Bahman',
+      'Bahman',
 
-     'Esfand'
+      'Esfand'
 
-     ),
+      ),
 
-   /************************************************************
+    /************************************************************
     *                        Days of Week
     ************************************************************
     *
@@ -206,64 +206,64 @@  discard block
 block discarded – undo
     *
     *\_________________________________________________________/
     */
-   'days_of_week' => array (
+    'days_of_week' => array (
 
-     'Shanbe',
+      'Shanbe',
 
-     'Yek-Shanbe',
+      'Yek-Shanbe',
 
-     'Do-Shanbe',
+      'Do-Shanbe',
 
-     'Se-Shanbe',
+      'Se-Shanbe',
 
-     'Chahar-Shanbe',
+      'Chahar-Shanbe',
 
-     'Panj-Shanbe',
+      'Panj-Shanbe',
 
-     'Jome'
+      'Jome'
 
-   ),
+    ),
 
-   'month_days_number' => array(     1 => 30,
-                                     2 => 29,
-                                     3 => 30,
-                                     4 => 30,
-                                     5 => 29,
-                                     6 => 29,
-                                     7 => 30,
-                                     8 => 29,
-                                     9 => 30,
-                                     10 => 29,
-                                     11 => 30,
-                                     12 => 30 ),
+    'month_days_number' => array(     1 => 30,
+                                      2 => 29,
+                                      3 => 30,
+                                      4 => 30,
+                                      5 => 29,
+                                      6 => 29,
+                                      7 => 30,
+                                      8 => 29,
+                                      9 => 30,
+                                      10 => 29,
+                                      11 => 30,
+                                      12 => 30 ),
 
-     'day_of_year' => function( $date_time ) {
+      'day_of_year' => function( $date_time ) {
 
-       $result = null;
+        $result = null;
 
-       $config = include( 'Ghamari.php' );
+        $config = include( 'Ghamari.php' );
 
-       $month = $date_time->format('n');
+        $month = $date_time->format('n');
 
-       $day = $date_time->format('d');
+        $day = $date_time->format('d');
 
-       foreach( $config['month_days_number'] as $_month => $value ) {
+        foreach( $config['month_days_number'] as $_month => $value ) {
 
-         if ( $_month < $month ) {
+          if ( $_month < $month ) {
 
-           $result += $value;
+            $result += $value;
 
-         }
+          }
 
-       }
+        }
 
-       $result += $day;
+        $result += $day;
 
-       return $result;
+        return $result;
 
-     },
+      },
 
-     /************************************************************
+      /************************************************************
       *                       Leap year
       ************************************************************
       *
@@ -271,9 +271,9 @@  discard block
 block discarded – undo
       *
       *\_________________________________________________________/
       */
-     'leap_year' => null,
+      'leap_year' => null,
 
-   /************************************************************
+    /************************************************************
     *                        Weekend
     ************************************************************
     *
@@ -281,6 +281,6 @@  discard block
 block discarded – undo
     *
     *\_________________________________________________________/
     */
-   'weekend' => array( 'friday' )
+    'weekend' => array( 'friday' )
 
   );

Please login to merge, or discard this patch.

src/CalendarSettings/Gregorian.php 1 patch

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

		@@ -1,10 +1,10 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		- use Datium\Datium as Datium;
	3	+ use Datium\Datium as Datium;
4	4
5		- return array (
	5	+ return array (
6	6
7		- /************************************************************
	7	+ /************************************************************
8	8	* Convert to
9	9	************************************************************
10	10	*
		@@ -12,13 +12,13 @@ discard block
		block discarded – undo
12	12	*
13	13	*\_________________________________________________________/
14	14	*/
15		- 'convert_to' => function( $date_time ) {
	15	+ 'convert_to' => function( $date_time ) {
16	16
17		- return null;
	17	+ return null;
18	18
19		- },
	19	+ },
20	20
21		- /************************************************************
	21	+ /************************************************************
22	22	* Convert From
23	23	************************************************************
24	24	*
		@@ -26,13 +26,13 @@ discard block
		block discarded – undo
26	26	*
27	27	*\_________________________________________________________/
28	28	*/
29		- 'convert_from' => function( $date_time ) {
	29	+ 'convert_from' => function( $date_time ) {
30	30
31		- return null;
	31	+ return null;
32	32
33		- },
	33	+ },
34	34
35		- /************************************************************
	35	+ /************************************************************
36	36	* Shorthand for jalali calendar
37	37	************************************************************
38	38	*
		@@ -40,9 +40,9 @@ discard block
		block discarded – undo
40	40	*
41	41	*\_________________________________________________________/
42	42	*/
43		- 'shorthand' => 'gr',
	43	+ 'shorthand' => 'gr',
44	44
45		- /************************************************************
	45	+ /************************************************************
46	46	* Month's name
47	47	************************************************************
48	48	*
		@@ -50,35 +50,35 @@ discard block
		block discarded – undo
50	50	*
51	51	*\_________________________________________________________/
52	52	*/
53		- 'month' => array (
	53	+ 'month' => array (
54	54
55		- 'Farvardin',
	55	+ 'Farvardin',
56	56
57		- 'Ordibehesht',
	57	+ 'Ordibehesht',
58	58
59		- 'Khordad',
	59	+ 'Khordad',
60	60
61		- 'Tir',
	61	+ 'Tir',
62	62
63		- 'Mordad',
	63	+ 'Mordad',
64	64
65		- 'Shahrivar',
	65	+ 'Shahrivar',
66	66
67		- 'Mehr',
	67	+ 'Mehr',
68	68
69		- 'Aban',
	69	+ 'Aban',
70	70
71		- 'Azar',
	71	+ 'Azar',
72	72
73		- 'Dey',
	73	+ 'Dey',
74	74
75		- 'Bahman',
	75	+ 'Bahman',
76	76
77		- 'Esfand'
	77	+ 'Esfand'
78	78
79		- ),
	79	+ ),
80	80
81		- /************************************************************
	81	+ /************************************************************
82	82	* Days of Week
83	83	************************************************************
84	84	*
		@@ -87,61 +87,61 @@ discard block
		block discarded – undo
87	87	*
88	88	*\_________________________________________________________/
89	89	*/
90		- 'days_of_week' => array (
	90	+ 'days_of_week' => array (
91	91
92		- 'Shanbe',
	92	+ 'Shanbe',
93	93
94		- 'Yek-Shanbe',
	94	+ 'Yek-Shanbe',
95	95
96		- 'Do-Shanbe',
	96	+ 'Do-Shanbe',
97	97
98		- 'Se-Shanbe',
	98	+ 'Se-Shanbe',
99	99
100		- 'Chahar-Shanbe',
	100	+ 'Chahar-Shanbe',
101	101
102		- 'Panj-Shanbe',
	102	+ 'Panj-Shanbe',
103	103
104		- 'Jome'
	104	+ 'Jome'
105	105
106		- ),
	106	+ ),
107	107
108		- 'month_days_number' => array( 1 => 31,
109		- 2 => 28,
110		- 3 => 31,
111		- 4 => 30,
112		- 5 => 31,
113		- 6 => 30,
114		- 7 => 31,
115		- 8 => 31,
116		- 9 => 30,
117		- 10 => 31,
118		- 11 => 30,
119		- 12 => 30 ),
	108	+ 'month_days_number' => array( 1 => 31,
	109	+ 2 => 28,
	110	+ 3 => 31,
	111	+ 4 => 30,
	112	+ 5 => 31,
	113	+ 6 => 30,
	114	+ 7 => 31,
	115	+ 8 => 31,
	116	+ 9 => 30,
	117	+ 10 => 31,
	118	+ 11 => 30,
	119	+ 12 => 30 ),
120	120
121	121
122		- 'day_of_year' => function( $date_time ) {
	122	+ 'day_of_year' => function( $date_time ) {
123	123
124		- $result = null;
	124	+ $result = null;
125	125
126		- $config = include( 'Gregorian.php' );
	126	+ $config = include( 'Gregorian.php' );
127	127
128		- $month = $date_time->format('n');
	128	+ $month = $date_time->format('n');
129	129
130		- $day = $date_time->format('d');
	130	+ $day = $date_time->format('d');
131	131
132		- foreach( $config['month_days_number'] as $month => $value ) {
	132	+ foreach( $config['month_days_number'] as $month => $value ) {
133	133
134		- if ( $_month < $month ) $result += $value;
	134	+ if ( $_month < $month ) $result += $value;
135	135
136		- }
	136	+ }
137	137
138		- $result += $this->day;
	138	+ $result += $this->day;
139	139
140		- return $result;
	140	+ return $result;
141	141
142		- },
	142	+ },
143	143
144		- /************************************************************
	144	+ /************************************************************
145	145	* Leap year
146	146	************************************************************
147	147	*
		@@ -149,9 +149,9 @@ discard block
		block discarded – undo
149	149	*
150	150	*\_________________________________________________________/
151	151	*/
152		- 'leap_year' => null,
	152	+ 'leap_year' => null,
153	153
154		- /************************************************************
	154	+ /************************************************************
155	155	* Weekend
156	156	************************************************************
157	157	*
		@@ -159,6 +159,6 @@ discard block
		block discarded – undo
159	159	*
160	160	*\_________________________________________________________/
161	161	*/
162		- 'weekend' => array( 'friday' )
	162	+ 'weekend' => array( 'friday' )
163	163
164	164	);

Please login to merge, or discard this patch.

src/DayOf.php 1 patch

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

@@ -68,13 +68,13 @@  discard block
 block discarded – undo
 
       $this->result = $this->islamic_day_of_week();
 
-       break;
+        break;
 
       case 'gr':
 
       $this->result = date( 'w', strtotime( $this->date_time->format('Y-m-d H:i:s') ) ) + 1;
 
-       break;
+        break;
     }
 
     return $this->result;
@@ -98,9 +98,9 @@  discard block
 block discarded – undo
   }
 
     /**
-   * @since Sept, 14 2015
-   * @return integer
-   */
+     * @since Sept, 14 2015
+     * @return integer
+     */
   protected function islamic_day_of_week() {
 
     $this->day = str_replace( $this->config['week_days_name']['english'], $this->config['week_days_name']['islamic'][$this->geregorian_DayofWeek], $this->day);

Please login to merge, or discard this patch.

		@@ -8,7 +8,7 @@ discard block
		block discarded – undo
8	8	/**
9	9	* @param integer store year value
10	10	*/
11		- protected $year;
	11	+ protected $year;
12	12
13	13	/**
14	14	* @param string store type of year value
		@@ -25,15 +25,15 @@ discard block
		block discarded – undo
25	25	* @param $year integer
26	26	* @since Aug, 21 2015
27	27	*/
28		- public function __construct( $year, $type = 'gregorian' ) {
	28	+ public function __construct( $year, $type = 'gregorian' ) {
29	29
30		- $this->year = $year;
	30	+ $this->year = $year;
31	31
32	32	$this->type = $type;
33	33
34	34	return $this;
35	35
36		- }
	36	+ }
37	37
38	38	/**
39	39	* check the gregorian year is leap or not
		@@ -53,7 +53,7 @@ discard block
		block discarded – undo
53	53	*/
54	54	public function shamsiLeapYear() {
55	55
56		- $shamsi_years = 0;
	56	+ $shamsi_years = 0;
57	57
58	58	while ( $shamsi_years < ( $this->year - 128 ) ) {
59	59
		@@ -70,7 +70,7 @@ discard block
		block discarded – undo
70	70
71	71	$this->result = $this->result % 33;
72	72
73		- }
	73	+ }
74	74
75	75	if ( ( $this->result == 28 ) \|\| ( $this->result == 27 ) ) {
76	76
		@@ -87,7 +87,7 @@ discard block
		block discarded – undo
87	87
88	88	$this->result = $this->result % 33;
89	89
90		- }
	90	+ }
91	91
92	92	if ( ( ( $this->result % 4 ) == 0 ) && ( $this->result != 28 ) ) {
93	93
		@@ -132,7 +132,7 @@ discard block
		block discarded – undo
132	132
133	133	$this->result = $this->shamsiLeapYear();
134	134
135		- break;
	135	+ break;
136	136
137	137	case 'ghamari':
138	138

		@@ -1,8 +1,8 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		- return array (
	3	+ return array (
4	4
5		- /************************************************************
	5	+ /************************************************************
6	6	* Convert to
7	7	************************************************************
8	8	*
		@@ -10,85 +10,85 @@ discard block
		block discarded – undo
10	10	*
11	11	*\_________________________________________________________/
12	12	*/
13		- 'convert_to' => function( $date_time ) {
	13	+ 'convert_to' => function( $date_time ) {
14	14
15		- $config = include( 'Shamsi.php' );
	15	+ $config = include( 'Shamsi.php' );
16	16
17		- $date_time = Datium\Datium::create( $date_time )->to( 'shamsi' )->object();
	17	+ $date_time = Datium\Datium::create( $date_time )->to( 'shamsi' )->object();
18	18
19		- $year = $date_time->format('Y');
	19	+ $year = $date_time->format('Y');
20	20
21		- $month = $date_time->format('n');
	21	+ $month = $date_time->format('n');
22	22
23		- $day = $date_time->format('d');
	23	+ $day = $date_time->format('d');
24	24
25		- $temp_day = 0 ;
	25	+ $temp_day = 0 ;
26	26
27		- for ( $i = 1 ; $i < $month ; $i++ ) {
	27	+ for ( $i = 1 ; $i < $month ; $i++ ) {
28	28
29		- $temp_day += $config[ 'month_days_number' ][ $i ];
	29	+ $temp_day += $config[ 'month_days_number' ][ $i ];
30	30
31		- }
	31	+ }
32	32
33	33	$temp_day += $day;
34	34
35	35	$leap = new Datium\Tools\Leap( $year );
36	36
37		- if( $leap->get() && $month > 11 ) $temp_day++;
	37	+ if( $leap->get() && $month > 11 ) $temp_day++;
38	38
39		- $_year = ( ( ( ( ( $year - 1 ) * 365.2422 ) + $temp_day ) - 119) / 354.3670 ) + 1;
	39	+ $_year = ( ( ( ( ( $year - 1 ) * 365.2422 ) + $temp_day ) - 119) / 354.3670 ) + 1;
40	40
41		- $_year = explode( '.', $_year );
	41	+ $_year = explode( '.', $_year );
42	42
43		- $year = $_year[0];
	43	+ $year = $_year[0];
44	44
45		- $_month = $_year[1];
	45	+ $_month = $_year[1];
46	46
47	47	$var_temp = '0.0';
48	48
49		- for ( $i = strlen( $_month ); $i > 2; $i-- ) {
	49	+ for ( $i = strlen( $_month ); $i > 2; $i-- ) {
50	50
51		- $var_temp .= '0';
	51	+ $var_temp .= '0';
52	52
53	53	}
54	54
55	55	$var_temp .= '1';
56	56
57		- $_month = $_month * $var_temp ;
	57	+ $_month = $_month * $var_temp ;
58	58
59		- $_month = ( $_month * 12 ) + 1;
	59	+ $_month = ( $_month * 12 ) + 1;
60	60
61		- $_month = explode( '.', $_month );
	61	+ $_month = explode( '.', $_month );
62	62
63		- $month = $_month[0];
	63	+ $month = $_month[0];
64	64
65		- $_day = $_month[1];
	65	+ $_day = $_month[1];
66	66
67		- $var_temp = '0.0';
	67	+ $var_temp = '0.0';
68	68
69		- for ( $i = strlen( $_day ); $i > 2; $i-- ) {
	69	+ for ( $i = strlen( $_day ); $i > 2; $i-- ) {
70	70
71	71	$var_temp .= '0' ;
72	72
73		- }
	73	+ }
74	74
75		- $var_temp .= '1';
	75	+ $var_temp .= '1';
76	76
77		- $_day = $_day * $var_temp;
	77	+ $_day = $_day * $var_temp;
78	78
79		- $_day = ( $_day * 29.530 );
	79	+ $_day = ( $_day * 29.530 );
80	80
81		- $_day = explode( '.', $_day );
	81	+ $_day = explode( '.', $_day );
82	82
83		- $day = $_day[0];
	83	+ $day = $_day[0];
84	84
85	85	$date_time->setDate( $year, $month, $day );
86	86
87	87	return $date_time;
88	88
89		- },
	89	+ },
90	90
91		- /************************************************************
	91	+ /************************************************************
92	92	* Convert From
93	93	************************************************************
94	94	*
		@@ -96,62 +96,62 @@ discard block
		block discarded – undo
96	96	*
97	97	*\_________________________________________________________/
98	98	*/
99		- 'convert_from' => function( $date_time ) {
	99	+ 'convert_from' => function( $date_time ) {
100	100
101		- $config = include('Ghamari.php');
	101	+ $config = include('Ghamari.php');
102	102
103		- $year = $date_time->format('Y');
	103	+ $year = $date_time->format('Y');
104	104
105		- $month = $date_time->format('m');
	105	+ $month = $date_time->format('m');
106	106
107		- $day = $date_time->format('d');
	107	+ $day = $date_time->format('d');
108	108
109		- $days_of_year = 0;
	109	+ $days_of_year = 0;
110	110
111		- foreach ( $config['month_days_number'] as $month => $value ) {
	111	+ foreach ( $config['month_days_number'] as $month => $value ) {
112	112
113		- if( $month > $month ) $days_of_year += $value;
	113	+ if( $month > $month ) $days_of_year += $value;
114	114
115		- }
	115	+ }
116	116
117		- $days_of_year += $day;
	117	+ $days_of_year += $day;
118	118
119		- $days_of_leap_years = intval( ( ( $year - 1 ) / 3 ) );
	119	+ $days_of_leap_years = intval( ( ( $year - 1 ) / 3 ) );
120	120
121		- $days_of_ghamari_years = ( ( ( $year - 1 ) * 354 ) + $days_of_year + $days_of_leap_years );
	121	+ $days_of_ghamari_years = ( ( ( $year - 1 ) * 354 ) + $days_of_year + $days_of_leap_years );
122	122
123		- $days_of_gregorain_years = $days_of_ghamari_years + 227078;
	123	+ $days_of_gregorain_years = $days_of_ghamari_years + 227078;
124	124
125		- $days_of_gregorain_years = $days_of_gregorain_years - intval( ( ( $year + 578 ) / 4 ) );
	125	+ $days_of_gregorain_years = $days_of_gregorain_years - intval( ( ( $year + 578 ) / 4 ) );
126	126
127		- $gregorian_month = ( $days_of_gregorain_years % 365 );
	127	+ $gregorian_month = ( $days_of_gregorain_years % 365 );
128	128
129		- $gregorian_year = intval( $days_of_gregorain_years / 365 ) + 1;
	129	+ $gregorian_year = intval( $days_of_gregorain_years / 365 ) + 1;
130	130
131		- $config = include('Gregorian.php');
	131	+ $config = include('Gregorian.php');
132	132
133		- foreach ($config [ 'month_days_number' ] as $month => $value) {
	133	+ foreach ($config [ 'month_days_number' ] as $month => $value) {
134	134
135		- if ( $gregorian_month < $value ) {
	135	+ if ( $gregorian_month < $value ) {
136	136
137		- break;
138		- }
	137	+ break;
	138	+ }
139	139
140		- $gregorian_month -= $value;
141		- }
	140	+ $gregorian_month -= $value;
	141	+ }
142	142
143		- $gregorian_day = $gregorian_month;
	143	+ $gregorian_day = $gregorian_month;
144	144
145		- $gregorian_month = $month;
	145	+ $gregorian_month = $month;
146	146
147		- $date_time->setDate( $gregorian_year, $gregorian_month, $gregorian_day );
	147	+ $date_time->setDate( $gregorian_year, $gregorian_month, $gregorian_day );
148	148
149	149	return $date_time;
150	150
151	151
152		- },
	152	+ },
153	153
154		- /************************************************************
	154	+ /************************************************************
155	155	* Shorthand for jalali calendar
156	156	************************************************************
157	157	*
		@@ -159,9 +159,9 @@ discard block
		block discarded – undo
159	159	*
160	160	*\_________________________________________________________/
161	161	*/
162		- 'shorthand' => 'sh',
	162	+ 'shorthand' => 'sh',
163	163
164		- /************************************************************
	164	+ /************************************************************
165	165	* Month's name
166	166	************************************************************
167	167	*
		@@ -169,35 +169,35 @@ discard block
		block discarded – undo
169	169	*
170	170	*\_________________________________________________________/
171	171	*/
172		- 'month' => array (
	172	+ 'month' => array (
173	173
174		- 'Farvardin',
	174	+ 'Farvardin',
175	175
176		- 'Ordibehesht',
	176	+ 'Ordibehesht',
177	177
178		- 'Khordad',
	178	+ 'Khordad',
179	179
180		- 'Tir',
	180	+ 'Tir',
181	181
182		- 'Mordad',
	182	+ 'Mordad',
183	183
184		- 'Shahrivar',
	184	+ 'Shahrivar',
185	185
186		- 'Mehr',
	186	+ 'Mehr',
187	187
188		- 'Aban',
	188	+ 'Aban',
189	189
190		- 'Azar',
	190	+ 'Azar',
191	191
192		- 'Dey',
	192	+ 'Dey',
193	193
194		- 'Bahman',
	194	+ 'Bahman',
195	195
196		- 'Esfand'
	196	+ 'Esfand'
197	197
198		- ),
	198	+ ),
199	199
200		- /************************************************************
	200	+ /************************************************************
201	201	* Days of Week
202	202	************************************************************
203	203	*
		@@ -206,64 +206,64 @@ discard block
		block discarded – undo
206	206	*
207	207	*\_________________________________________________________/
208	208	*/
209		- 'days_of_week' => array (
	209	+ 'days_of_week' => array (
210	210
211		- 'Shanbe',
	211	+ 'Shanbe',
212	212
213		- 'Yek-Shanbe',
	213	+ 'Yek-Shanbe',
214	214
215		- 'Do-Shanbe',
	215	+ 'Do-Shanbe',
216	216
217		- 'Se-Shanbe',
	217	+ 'Se-Shanbe',
218	218
219		- 'Chahar-Shanbe',
	219	+ 'Chahar-Shanbe',
220	220
221		- 'Panj-Shanbe',
	221	+ 'Panj-Shanbe',
222	222
223		- 'Jome'
	223	+ 'Jome'
224	224
225		- ),
	225	+ ),
226	226
227		- 'month_days_number' => array( 1 => 30,
228		- 2 => 29,
229		- 3 => 30,
230		- 4 => 30,
231		- 5 => 29,
232		- 6 => 29,
233		- 7 => 30,
234		- 8 => 29,
235		- 9 => 30,
236		- 10 => 29,
237		- 11 => 30,
238		- 12 => 30 ),
	227	+ 'month_days_number' => array( 1 => 30,
	228	+ 2 => 29,
	229	+ 3 => 30,
	230	+ 4 => 30,
	231	+ 5 => 29,
	232	+ 6 => 29,
	233	+ 7 => 30,
	234	+ 8 => 29,
	235	+ 9 => 30,
	236	+ 10 => 29,
	237	+ 11 => 30,
	238	+ 12 => 30 ),
239	239
240		- 'day_of_year' => function( $date_time ) {
	240	+ 'day_of_year' => function( $date_time ) {
241	241
242		- $result = null;
	242	+ $result = null;
243	243
244		- $config = include( 'Ghamari.php' );
	244	+ $config = include( 'Ghamari.php' );
245	245
246		- $month = $date_time->format('n');
	246	+ $month = $date_time->format('n');
247	247
248		- $day = $date_time->format('d');
	248	+ $day = $date_time->format('d');
249	249
250		- foreach( $config['month_days_number'] as $_month => $value ) {
	250	+ foreach( $config['month_days_number'] as $_month => $value ) {
251	251
252		- if ( $_month < $month ) {
	252	+ if ( $_month < $month ) {
253	253
254		- $result += $value;
	254	+ $result += $value;
255	255
256		- }
	256	+ }
257	257
258		- }
	258	+ }
259	259
260		- $result += $day;
	260	+ $result += $day;
261	261
262		- return $result;
	262	+ return $result;
263	263
264		- },
	264	+ },
265	265
266		- /************************************************************
	266	+ /************************************************************
267	267	* Leap year
268	268	************************************************************
269	269	*
		@@ -271,9 +271,9 @@ discard block
		block discarded – undo
271	271	*
272	272	*\_________________________________________________________/
273	273	*/
274		- 'leap_year' => null,
	274	+ 'leap_year' => null,
275	275
276		- /************************************************************
	276	+ /************************************************************
277	277	* Weekend
278	278	************************************************************
279	279	*
		@@ -281,6 +281,6 @@ discard block
		block discarded – undo
281	281	*
282	282	*\_________________________________________________________/
283	283	*/
284		- 'weekend' => array( 'friday' )
	284	+ 'weekend' => array( 'friday' )
285	285
286	286	);

		@@ -68,13 +68,13 @@ discard block
		block discarded – undo
68	68
69	69	$this->result = $this->islamic_day_of_week();
70	70
71		- break;
	71	+ break;
72	72
73	73	case 'gr':
74	74
75	75	$this->result = date( 'w', strtotime( $this->date_time->format('Y-m-d H:i:s') ) ) + 1;
76	76
77		- break;
	77	+ break;
78	78	}
79	79
80	80	return $this->result;
		@@ -98,9 +98,9 @@ discard block
		block discarded – undo
98	98	}
99	99
100	100	/**
101		- * @since Sept, 14 2015
102		- * @return integer
103		- */
	101	+ * @since Sept, 14 2015
	102	+ * @return integer
	103	+ */
104	104	protected function islamic_day_of_week() {
105	105
106	106	$this->day = str_replace( $this->config['week_days_name']['english'], $this->config['week_days_name']['islamic'][$this->geregorian_DayofWeek], $this->day);

opencafe / datium

Push — master ( 13abb0...106f43 )

Status

Category

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

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

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

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