@@ -1,7 +1,6 @@ |
||
| 1 | 1 | <?php namespace Datium; |
| 2 | 2 | |
| 3 | 3 | use Datium\Tools\Convert; |
| 4 | -use Datium\Tools\DayOf; |
|
| 5 | 4 | use DateTime; |
| 6 | 5 | use DateInterval; |
| 7 | 6 | use DatePeriod; |
@@ -124,17 +124,17 @@ |
||
| 124 | 124 | $this->date_time->setDate(Events::$date_start->format('Y'), $month, $day); |
| 125 | 125 | |
| 126 | 126 | switch ($this->local[ 'default_calendar' ]) { |
| 127 | - case 'jalali': |
|
| 128 | - $this->date_time->setDate(1394, $month, $day); |
|
| 127 | + case 'jalali': |
|
| 128 | + $this->date_time->setDate(1394, $month, $day); |
|
| 129 | 129 | |
| 130 | - $this->date_time = Datium::create($this->date_time)->from('jalali')->to('gregorian')->object(); //$this->convert->jalaliToGregorian( $this->date_time ); |
|
| 130 | + $this->date_time = Datium::create($this->date_time)->from('jalali')->to('gregorian')->object(); //$this->convert->jalaliToGregorian( $this->date_time ); |
|
| 131 | 131 | |
| 132 | - break; |
|
| 132 | + break; |
|
| 133 | 133 | |
| 134 | - case 'hijri': |
|
| 135 | - $this->date_time = Datium::create($this->date_time)->from('hijri')->to('gregorian')->object(); // $this->convert->hijriToGregorian( $this->date_time ); |
|
| 134 | + case 'hijri': |
|
| 135 | + $this->date_time = Datium::create($this->date_time)->from('hijri')->to('gregorian')->object(); // $this->convert->hijriToGregorian( $this->date_time ); |
|
| 136 | 136 | |
| 137 | - break; |
|
| 137 | + break; |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | $this->result[ $this->date_time->format('Y-m-d') ][] = $event; |
@@ -1,7 +1,5 @@ |
||
| 1 | 1 | ``<?php |
| 2 | 2 | |
| 3 | - use OpenCafe\Datium as Datium; |
|
| 4 | - |
|
| 5 | 3 | return array ( |
| 6 | 4 | |
| 7 | 5 | 'numbers' => array( '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'), |
@@ -18,7 +18,6 @@ |
||
| 18 | 18 | use OpenCafe\Tools\Leap; |
| 19 | 19 | use OpenCafe\Tools\DayOf; |
| 20 | 20 | use OpenCafe\Tools\Lang; |
| 21 | - |
|
| 22 | 21 | use OpenCafe\Datium; |
| 23 | 22 | |
| 24 | 23 | /** |
@@ -112,36 +112,36 @@ |
||
| 112 | 112 | $this->calendar_type = 'gregorian'; |
| 113 | 113 | |
| 114 | 114 | switch (Datium::$call_type) { |
| 115 | - case 'now': |
|
| 116 | - $this->date_time = new DateTime('now'); |
|
| 115 | + case 'now': |
|
| 116 | + $this->date_time = new DateTime('now'); |
|
| 117 | 117 | |
| 118 | - $this->gregorian_DayofWeek = $this->date_time->format('w'); |
|
| 118 | + $this->gregorian_DayofWeek = $this->date_time->format('w'); |
|
| 119 | 119 | |
| 120 | - break; |
|
| 120 | + break; |
|
| 121 | 121 | |
| 122 | - case 'make': |
|
| 123 | - $this->date_time = new DateTime('now'); |
|
| 122 | + case 'make': |
|
| 123 | + $this->date_time = new DateTime('now'); |
|
| 124 | 124 | |
| 125 | - $this->date_time->setDate( |
|
| 126 | - self::$array_date[ 'year' ], |
|
| 127 | - self::$array_date[ 'month' ], |
|
| 128 | - self::$array_date[ 'day' ] |
|
| 129 | - ); |
|
| 125 | + $this->date_time->setDate( |
|
| 126 | + self::$array_date[ 'year' ], |
|
| 127 | + self::$array_date[ 'month' ], |
|
| 128 | + self::$array_date[ 'day' ] |
|
| 129 | + ); |
|
| 130 | 130 | |
| 131 | - $this->date_time->setTime( |
|
| 132 | - self::$array_date[ 'hour' ], |
|
| 133 | - self::$array_date[ 'minute' ], |
|
| 134 | - self::$array_date[ 'second' ] |
|
| 135 | - ); |
|
| 131 | + $this->date_time->setTime( |
|
| 132 | + self::$array_date[ 'hour' ], |
|
| 133 | + self::$array_date[ 'minute' ], |
|
| 134 | + self::$array_date[ 'second' ] |
|
| 135 | + ); |
|
| 136 | 136 | |
| 137 | - $this->gregorian_DayofWeek = $this->date_time->format('w'); |
|
| 137 | + $this->gregorian_DayofWeek = $this->date_time->format('w'); |
|
| 138 | 138 | |
| 139 | - break; |
|
| 139 | + break; |
|
| 140 | 140 | |
| 141 | - case 'set': |
|
| 142 | - $this->date_time = Datium::$static_date_time; |
|
| 141 | + case 'set': |
|
| 142 | + $this->date_time = Datium::$static_date_time; |
|
| 143 | 143 | |
| 144 | - $this->gregorian_DayofWeek = $this->date_time->format('w'); |
|
| 144 | + $this->gregorian_DayofWeek = $this->date_time->format('w'); |
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | $this->convert_calendar = new Convert(); |