@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | /** |
51 | 51 | * Load Calendar base class. |
52 | 52 | */ |
53 | -require_once CALENDAR_ROOT . 'Calendar.php'; |
|
53 | +require_once CALENDAR_ROOT.'Calendar.php'; |
|
54 | 54 | |
55 | 55 | /** |
56 | 56 | * Contains a factory method to return a Singleton instance of a class |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $firstDay = defined('CALENDAR_FIRST_DAY_OF_WEEK') ? CALENDAR_FIRST_DAY_OF_WEEK : 1; |
98 | 98 | switch ($type) { |
99 | 99 | case 'Day': |
100 | - require_once CALENDAR_ROOT . 'Day.php'; |
|
100 | + require_once CALENDAR_ROOT.'Day.php'; |
|
101 | 101 | |
102 | 102 | return new Calendar_Day($y, $m, $d); |
103 | 103 | case 'Month': |
@@ -107,44 +107,44 @@ discard block |
||
107 | 107 | } |
108 | 108 | switch (CALENDAR_MONTH_STATE) { |
109 | 109 | case CALENDAR_USE_MONTH_WEEKDAYS: |
110 | - require_once CALENDAR_ROOT . 'Month/Weekdays.php'; |
|
110 | + require_once CALENDAR_ROOT.'Month/Weekdays.php'; |
|
111 | 111 | $class = 'Calendar_Month_Weekdays'; |
112 | 112 | break; |
113 | 113 | case CALENDAR_USE_MONTH_WEEKS: |
114 | - require_once CALENDAR_ROOT . 'Month/Weeks.php'; |
|
114 | + require_once CALENDAR_ROOT.'Month/Weeks.php'; |
|
115 | 115 | $class = 'Calendar_Month_Weeks'; |
116 | 116 | break; |
117 | 117 | case CALENDAR_USE_MONTH: |
118 | 118 | default: |
119 | - require_once CALENDAR_ROOT . 'Month.php'; |
|
119 | + require_once CALENDAR_ROOT.'Month.php'; |
|
120 | 120 | $class = 'Calendar_Month'; |
121 | 121 | break; |
122 | 122 | } |
123 | 123 | |
124 | 124 | return new $class($y, $m, $firstDay); |
125 | 125 | case 'Week': |
126 | - require_once CALENDAR_ROOT . 'Week.php'; |
|
126 | + require_once CALENDAR_ROOT.'Week.php'; |
|
127 | 127 | |
128 | 128 | return new Calendar_Week($y, $m, $d, $firstDay); |
129 | 129 | case 'Hour': |
130 | - require_once CALENDAR_ROOT . 'Hour.php'; |
|
130 | + require_once CALENDAR_ROOT.'Hour.php'; |
|
131 | 131 | |
132 | 132 | return new Calendar_Hour($y, $m, $d, $h); |
133 | 133 | case 'Minute': |
134 | - require_once CALENDAR_ROOT . 'Minute.php'; |
|
134 | + require_once CALENDAR_ROOT.'Minute.php'; |
|
135 | 135 | |
136 | 136 | return new Calendar_Minute($y, $m, $d, $h, $i); |
137 | 137 | case 'Second': |
138 | - require_once CALENDAR_ROOT . 'Second.php'; |
|
138 | + require_once CALENDAR_ROOT.'Second.php'; |
|
139 | 139 | |
140 | 140 | return new Calendar_Second($y, $m, $d, $h, $i, $s); |
141 | 141 | case 'Year': |
142 | - require_once CALENDAR_ROOT . 'Year.php'; |
|
142 | + require_once CALENDAR_ROOT.'Year.php'; |
|
143 | 143 | |
144 | 144 | return new Calendar_Year($y); |
145 | 145 | default: |
146 | - require_once __DIR__ . '/PEAR.php'; |
|
147 | - PEAR::raiseError('Calendar_Factory::create() unrecognised type: ' . $type, null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Factory::create()'); |
|
146 | + require_once __DIR__.'/PEAR.php'; |
|
147 | + PEAR::raiseError('Calendar_Factory::create() unrecognised type: '.$type, null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Factory::create()'); |
|
148 | 148 | |
149 | 149 | return false; |
150 | 150 | } |
@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | // |
3 | 3 | |
4 | -require_once __DIR__ . '/simple_include.php'; |
|
5 | -require_once __DIR__ . '/calendar_include.php'; |
|
4 | +require_once __DIR__.'/simple_include.php'; |
|
5 | +require_once __DIR__.'/calendar_include.php'; |
|
6 | 6 | |
7 | 7 | Mock::generate('Calendar_Engine_Interface', 'Mock_Calendar_Engine'); |
8 | 8 | Mock::generate('Calendar_Second', 'Mock_Calendar_Second'); |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | // |
3 | 3 | |
4 | -require_once __DIR__ . '/simple_include.php'; |
|
5 | -require_once __DIR__ . '/calendar_include.php'; |
|
4 | +require_once __DIR__.'/simple_include.php'; |
|
5 | +require_once __DIR__.'/calendar_include.php'; |
|
6 | 6 | |
7 | -require_once __DIR__ . '/./calendar_test.php'; |
|
7 | +require_once __DIR__.'/./calendar_test.php'; |
|
8 | 8 | |
9 | 9 | /** |
10 | 10 | * Class TestOfSecond. |
@@ -27,13 +27,13 @@ |
||
27 | 27 | public function testPrevDay_Array() |
28 | 28 | { |
29 | 29 | $this->assertEqual([ |
30 | - 'year' => 2003, |
|
31 | - 'month' => 10, |
|
32 | - 'day' => 24, |
|
33 | - 'hour' => 0, |
|
34 | - 'minute' => 0, |
|
35 | - 'second' => 0, |
|
36 | - ], $this->cal->prevDay('array')); |
|
30 | + 'year' => 2003, |
|
31 | + 'month' => 10, |
|
32 | + 'day' => 24, |
|
33 | + 'hour' => 0, |
|
34 | + 'minute' => 0, |
|
35 | + 'second' => 0, |
|
36 | + ], $this->cal->prevDay('array')); |
|
37 | 37 | } |
38 | 38 | } |
39 | 39 |
@@ -1,19 +1,19 @@ |
||
1 | 1 | <?php |
2 | 2 | // |
3 | 3 | |
4 | -require_once __DIR__ . '/simple_include.php'; |
|
5 | -require_once __DIR__ . '/calendar_include.php'; |
|
4 | +require_once __DIR__.'/simple_include.php'; |
|
5 | +require_once __DIR__.'/calendar_include.php'; |
|
6 | 6 | |
7 | 7 | define('TEST_RUNNING', true); |
8 | 8 | |
9 | -require_once __DIR__ . '/calendar_tests.php'; |
|
10 | -require_once __DIR__ . '/calendar_tabular_tests.php'; |
|
11 | -require_once __DIR__ . '/validator_tests.php'; |
|
12 | -require_once __DIR__ . '/calendar_engine_tests.php'; |
|
13 | -require_once __DIR__ . '/calendar_engine_tests.php'; |
|
14 | -require_once __DIR__ . '/table_helper_tests.php'; |
|
15 | -require_once __DIR__ . '/decorator_tests.php'; |
|
16 | -require_once __DIR__ . '/util_tests.php'; |
|
9 | +require_once __DIR__.'/calendar_tests.php'; |
|
10 | +require_once __DIR__.'/calendar_tabular_tests.php'; |
|
11 | +require_once __DIR__.'/validator_tests.php'; |
|
12 | +require_once __DIR__.'/calendar_engine_tests.php'; |
|
13 | +require_once __DIR__.'/calendar_engine_tests.php'; |
|
14 | +require_once __DIR__.'/table_helper_tests.php'; |
|
15 | +require_once __DIR__.'/decorator_tests.php'; |
|
16 | +require_once __DIR__.'/util_tests.php'; |
|
17 | 17 | |
18 | 18 | /** |
19 | 19 | * Class AllTests. |
@@ -1,27 +1,27 @@ |
||
1 | 1 | <?php |
2 | 2 | // |
3 | -if (!@include __DIR__ . '/Calendar/Calendar.php') { |
|
3 | +if (!@include __DIR__.'/Calendar/Calendar.php') { |
|
4 | 4 | @define('CALENDAR_ROOT', '../'); |
5 | 5 | } |
6 | -require_once CALENDAR_ROOT . 'Year.php'; |
|
7 | -require_once CALENDAR_ROOT . 'Month.php'; |
|
8 | -require_once CALENDAR_ROOT . 'Day.php'; |
|
9 | -require_once CALENDAR_ROOT . 'Week.php'; |
|
10 | -require_once CALENDAR_ROOT . 'Hour.php'; |
|
11 | -require_once CALENDAR_ROOT . 'Minute.php'; |
|
12 | -require_once CALENDAR_ROOT . 'Second.php'; |
|
13 | -require_once CALENDAR_ROOT . 'Month.php'; |
|
14 | -require_once CALENDAR_ROOT . 'Decorator.php'; |
|
15 | -require_once CALENDAR_ROOT . 'Month/Weekdays.php'; |
|
16 | -require_once CALENDAR_ROOT . 'Month/Weeks.php'; |
|
17 | -require_once CALENDAR_ROOT . 'Validator.php'; |
|
18 | -require_once CALENDAR_ROOT . 'Engine/Interface.php'; |
|
19 | -require_once CALENDAR_ROOT . 'Engine/UnixTs.php'; |
|
20 | -require_once CALENDAR_ROOT . 'Engine/PearDate.php'; |
|
21 | -require_once CALENDAR_ROOT . 'Table/Helper.php'; |
|
22 | -require_once CALENDAR_ROOT . 'Decorator/Textual.php'; |
|
23 | -require_once CALENDAR_ROOT . 'Decorator/Uri.php'; |
|
24 | -require_once CALENDAR_ROOT . 'Decorator/Weekday.php'; |
|
25 | -require_once CALENDAR_ROOT . 'Decorator/Wrapper.php'; |
|
26 | -require_once CALENDAR_ROOT . 'Util/Uri.php'; |
|
27 | -require_once CALENDAR_ROOT . 'Util/Textual.php'; |
|
6 | +require_once CALENDAR_ROOT.'Year.php'; |
|
7 | +require_once CALENDAR_ROOT.'Month.php'; |
|
8 | +require_once CALENDAR_ROOT.'Day.php'; |
|
9 | +require_once CALENDAR_ROOT.'Week.php'; |
|
10 | +require_once CALENDAR_ROOT.'Hour.php'; |
|
11 | +require_once CALENDAR_ROOT.'Minute.php'; |
|
12 | +require_once CALENDAR_ROOT.'Second.php'; |
|
13 | +require_once CALENDAR_ROOT.'Month.php'; |
|
14 | +require_once CALENDAR_ROOT.'Decorator.php'; |
|
15 | +require_once CALENDAR_ROOT.'Month/Weekdays.php'; |
|
16 | +require_once CALENDAR_ROOT.'Month/Weeks.php'; |
|
17 | +require_once CALENDAR_ROOT.'Validator.php'; |
|
18 | +require_once CALENDAR_ROOT.'Engine/Interface.php'; |
|
19 | +require_once CALENDAR_ROOT.'Engine/UnixTs.php'; |
|
20 | +require_once CALENDAR_ROOT.'Engine/PearDate.php'; |
|
21 | +require_once CALENDAR_ROOT.'Table/Helper.php'; |
|
22 | +require_once CALENDAR_ROOT.'Decorator/Textual.php'; |
|
23 | +require_once CALENDAR_ROOT.'Decorator/Uri.php'; |
|
24 | +require_once CALENDAR_ROOT.'Decorator/Weekday.php'; |
|
25 | +require_once CALENDAR_ROOT.'Decorator/Wrapper.php'; |
|
26 | +require_once CALENDAR_ROOT.'Util/Uri.php'; |
|
27 | +require_once CALENDAR_ROOT.'Util/Textual.php'; |
@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | // |
3 | 3 | |
4 | -require_once __DIR__ . '/simple_include.php'; |
|
5 | -require_once __DIR__ . '/calendar_include.php'; |
|
4 | +require_once __DIR__.'/simple_include.php'; |
|
5 | +require_once __DIR__.'/calendar_include.php'; |
|
6 | 6 | |
7 | 7 | /** |
8 | 8 | * Class TestOfUnixTsEngine. |
@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | // |
3 | 3 | |
4 | -require_once __DIR__ . '/simple_include.php'; |
|
5 | -require_once __DIR__ . '/calendar_include.php'; |
|
4 | +require_once __DIR__.'/simple_include.php'; |
|
5 | +require_once __DIR__.'/calendar_include.php'; |
|
6 | 6 | |
7 | 7 | /** |
8 | 8 | * Class TestOfPearDateEngine. |
@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | // |
3 | 3 | |
4 | -require_once __DIR__ . '/simple_include.php'; |
|
5 | -require_once __DIR__ . '/calendar_include.php'; |
|
4 | +require_once __DIR__.'/simple_include.php'; |
|
5 | +require_once __DIR__.'/calendar_include.php'; |
|
6 | 6 | |
7 | 7 | /** |
8 | 8 | * Class TestOfCalendar. |
@@ -37,13 +37,13 @@ discard block |
||
37 | 37 | public function testPrevYear_Array() |
38 | 38 | { |
39 | 39 | $this->assertEqual([ |
40 | - 'year' => 2002, |
|
41 | - 'month' => 1, |
|
42 | - 'day' => 1, |
|
43 | - 'hour' => 0, |
|
44 | - 'minute' => 0, |
|
45 | - 'second' => 0, |
|
46 | - ], $this->cal->prevYear('array')); |
|
40 | + 'year' => 2002, |
|
41 | + 'month' => 1, |
|
42 | + 'day' => 1, |
|
43 | + 'hour' => 0, |
|
44 | + 'minute' => 0, |
|
45 | + 'second' => 0, |
|
46 | + ], $this->cal->prevYear('array')); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | public function testThisYear() |
@@ -64,13 +64,13 @@ discard block |
||
64 | 64 | public function testPrevMonth_Array() |
65 | 65 | { |
66 | 66 | $this->assertEqual([ |
67 | - 'year' => 2003, |
|
68 | - 'month' => 9, |
|
69 | - 'day' => 1, |
|
70 | - 'hour' => 0, |
|
71 | - 'minute' => 0, |
|
72 | - 'second' => 0, |
|
73 | - ], $this->cal->prevMonth('array')); |
|
67 | + 'year' => 2003, |
|
68 | + 'month' => 9, |
|
69 | + 'day' => 1, |
|
70 | + 'hour' => 0, |
|
71 | + 'minute' => 0, |
|
72 | + 'second' => 0, |
|
73 | + ], $this->cal->prevMonth('array')); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | public function testThisMonth() |
@@ -91,13 +91,13 @@ discard block |
||
91 | 91 | public function testPrevDay_Array() |
92 | 92 | { |
93 | 93 | $this->assertEqual([ |
94 | - 'year' => 2003, |
|
95 | - 'month' => 10, |
|
96 | - 'day' => 24, |
|
97 | - 'hour' => 0, |
|
98 | - 'minute' => 0, |
|
99 | - 'second' => 0, |
|
100 | - ], $this->cal->prevDay('array')); |
|
94 | + 'year' => 2003, |
|
95 | + 'month' => 10, |
|
96 | + 'day' => 24, |
|
97 | + 'hour' => 0, |
|
98 | + 'minute' => 0, |
|
99 | + 'second' => 0, |
|
100 | + ], $this->cal->prevDay('array')); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | public function testThisDay() |
@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | // |
3 | 3 | |
4 | -require_once __DIR__ . '/simple_include.php'; |
|
5 | -require_once __DIR__ . '/calendar_include.php'; |
|
4 | +require_once __DIR__.'/simple_include.php'; |
|
5 | +require_once __DIR__.'/calendar_include.php'; |
|
6 | 6 | |
7 | 7 | /** |
8 | 8 | * Class CalendarEngineTests. |