Skip to content

Commit d370423

Browse files
author
Fred Condo
committed
Clean up trailing ?> per coding standard
All sapphire but the lang directory
1 parent 3939923 commit d370423

File tree

180 files changed

+52
-181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+52
-181
lines changed

admin/code/CMSMenu.php

-1
Original file line numberDiff line numberDiff line change
@@ -323,4 +323,3 @@ function provideI18nEntities() {
323323
return $entities;
324324
}
325325
}
326-
?>

admin/code/CMSMenuItem.php

-1
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,3 @@ public function __construct($title, $url, $controller = null, $priority = -1) {
4747
}
4848

4949
}
50-
?>

admin/code/GroupImportForm.php

-1
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,3 @@ function doImport($data, $form) {
8787
}
8888

8989
}
90-
?>

admin/code/LeftAndMain.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1345,4 +1345,4 @@ function mark($node) {
13451345
return array_key_exists((int) $id, $this->ids) ? $this->ids[$id] : false;
13461346
}
13471347
}
1348-
?>
1348+

admin/code/MemberImportForm.php

-1
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,3 @@ function getGroup($group) {
105105
return $this->group;
106106
}
107107
}
108-
?>

admin/code/MemberTableField.php

-1
Original file line numberDiff line numberDiff line change
@@ -368,4 +368,3 @@ function Actions() {
368368
}
369369
}
370370

371-
?>

admin/code/ModelAdmin.php

-1
Original file line numberDiff line numberDiff line change
@@ -1054,4 +1054,3 @@ function getCurrentRecord(){
10541054

10551055
}
10561056

1057-
?>

admin/code/SecurityAdmin.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -379,4 +379,4 @@ function run(SS_List $records) {
379379
return Convert::raw2json($status);
380380
}
381381
}
382-
?>
382+

admin/tests/SecurityAdminTest.php

-1
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,3 @@ function testPermissionFieldRespectsHiddenPermissions() {
9090
}
9191
}
9292

93-
?>

api/FormEncodedDataFormatter.php

-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,3 @@ public function convertStringToArray($strData) {
4040
}
4141

4242
}
43-
?>

api/JSONDataFormatter.php

-1
Original file line numberDiff line numberDiff line change
@@ -138,4 +138,3 @@ public function convertStringToArray($strData) {
138138
}
139139

140140
}
141-
?>

api/RSSFeed.php

-1
Original file line numberDiff line numberDiff line change
@@ -317,4 +317,3 @@ function AbsoluteLink() {
317317
else user_error($this->failover->class . " object has either an AbsoluteLink nor a Link method. Can't put a link in the RSS feed", E_USER_WARNING);
318318
}
319319
}
320-
?>

api/RestfulService.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -465,4 +465,4 @@ function xpath_one($xpath) {
465465
}
466466
}
467467

468-
?>
468+

api/SOAPModelAccess.php

-1
Original file line numberDiff line numberDiff line change
@@ -247,4 +247,3 @@ protected function getErrorMessage($response) {
247247
}
248248
}
249249

250-
?>

api/SapphireSoapServer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,4 @@ function index() {
100100
}
101101
}
102102

103-
?>
103+

api/VersionedRestfulServer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ function handleRequest($request, $model) {
2020
}
2121
}
2222

23-
?>
23+

cli-script.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,4 @@
8383
DataModel::set_inst(new DataModel());
8484
Director::direct($url, DataModel::inst());
8585

86-
?>
86+

control/Controller.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -568,4 +568,4 @@ static function join_links() {
568568
}
569569
}
570570

571-
?>
571+

control/FormResponse.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,4 +270,4 @@ protected static function get_javascript() {
270270
return $js;
271271
}
272272
}
273-
?>
273+

control/HTTP.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -400,4 +400,4 @@ static function get_cache_age() {
400400

401401
}
402402

403-
?>
403+

core/ClassInfo.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,4 +233,4 @@ static function classes_for_folder($folderPath) {
233233
}
234234

235235
}
236-
?>
236+

core/Diff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -879,4 +879,4 @@ function MappedDiff($from_lines, $to_lines,
879879
}
880880
}
881881

882-
?>
882+

core/Extension.php

-1
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,3 @@ public static function get_classname_without_arguments($extensionStr) {
8888

8989
}
9090

91-
?>

dev/BuildTask.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ public function getDescription() {
5757

5858
}
5959

60-
?>
60+

dev/BulkLoader.php

-1
Original file line numberDiff line numberDiff line change
@@ -410,4 +410,3 @@ protected function mapToArrayList($arr) {
410410
}
411411

412412
}
413-
?>

dev/CSVParser.php

-1
Original file line numberDiff line numberDiff line change
@@ -234,4 +234,3 @@ function valid() {
234234

235235
}
236236

237-
?>

dev/Cli.php

-1
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,3 @@ static function end_colour() {
8181
}
8282
}
8383

84-
?>

dev/CliDebugView.php

-1
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,3 @@ public function writeInfo($title, $subtitle, $description=false) {
6969

7070
}
7171

72-
?>

dev/CsvBulkLoader.php

-1
Original file line numberDiff line numberDiff line change
@@ -189,4 +189,3 @@ public function hasHeaderRow() {
189189
}
190190

191191
}
192-
?>

dev/DebugView.php

-1
Original file line numberDiff line numberDiff line change
@@ -169,4 +169,3 @@ function writeParagraph($text) {
169169
}
170170
}
171171

172-
?>

dev/InstallerTest.php

-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@ function testrewrite() {
1515
}
1616
}
1717

18-
?>

dev/MigrationTask.php

-1
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,3 @@ function down() {}
6767

6868
}
6969

70-
?>

dev/ModelViewer.php

-1
Original file line numberDiff line numberDiff line change
@@ -211,4 +211,3 @@ function __construct($model, $name, $relatedClass, $relationType) {
211211

212212
}
213213

214-
?>

dev/Profiler.php

-1
Original file line numberDiff line numberDiff line change
@@ -232,4 +232,3 @@ function __suspendTimer($name){
232232
$this->running[$name] += $this->elapsedTime($name);
233233
}
234234
}
235-
?>

dev/SapphireREPL.php

-1
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,3 @@ function index() {
8585
}
8686
}
8787

88-
?>

dev/SapphireTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -860,4 +860,4 @@ function logInWithPermission($permCode = "ADMIN") {
860860
protected $cache_generatedMembers = array();
861861
}
862862

863-
?>
863+

dev/SapphireTestReporter.php

-1
Original file line numberDiff line numberDiff line change
@@ -305,4 +305,3 @@ protected function testNameToPhrase($name) {
305305

306306
}
307307

308-
?>

dev/SapphireTestSuite.php

-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,3 @@ function tearDown() {
2121
}
2222
}
2323
}
24-
?>

dev/TaskRunner.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,4 @@ protected function getTasks() {
100100

101101
}
102102

103-
?>
103+

dev/TestOnly.php

-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ interface TestOnly {
88

99
}
1010

11-
?>

email/Email.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -766,4 +766,4 @@ public function canCreate($member = null) {
766766
}
767767
}
768768

769-
?>
769+

filesystem/Filesystem.php

-1
Original file line numberDiff line numberDiff line change
@@ -171,4 +171,3 @@ static function sync($folderID = null, $syncLinkTracking = true) {
171171

172172
}
173173

174-
?>

filesystem/GD.php

-1
Original file line numberDiff line numberDiff line change
@@ -408,4 +408,3 @@ function writeTo($filename) {
408408

409409
}
410410

411-
?>

forms/AjaxUniqueTextField.php

-1
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,3 @@ function validate( $validator ) {
124124
return true;
125125
}
126126
}
127-
?>

forms/ComplexTableField.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -876,4 +876,4 @@ function getParentController() {
876876
}
877877
}
878878

879-
?>
879+

forms/CompositeField.php

-1
Original file line numberDiff line numberDiff line change
@@ -330,4 +330,3 @@ function validate($validator){
330330
}
331331
}
332332

333-
?>

forms/CurrencyField.php

-1
Original file line numberDiff line numberDiff line change
@@ -143,4 +143,3 @@ function Field() {
143143
}
144144
}
145145

146-
?>

forms/CustomRequiredFields.php

-1
Original file line numberDiff line numberDiff line change
@@ -146,4 +146,3 @@ function appendRequiredFields($requiredFields){
146146
}
147147
}
148148

149-
?>

forms/DateField.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -704,4 +704,4 @@ static function convert_iso_to_jquery_format($format) {
704704
return preg_replace($patterns, $replacements, $format);
705705
}
706706
}
707-
?>
707+

forms/DatetimeField.php

-1
Original file line numberDiff line numberDiff line change
@@ -313,4 +313,3 @@ function validate($validator) {
313313
return true;
314314
}
315315
}
316-
?>

forms/DisabledTransformation.php

-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ public function transform($field) {
1010
}
1111
}
1212

13-
?>

forms/FieldGroup.php

-1
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,3 @@ function php($data){
182182

183183
}
184184

185-
?>

forms/FormTransformation.php

-1
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,3 @@ function transform(FormField $field) {
5151
}
5252
}
5353

54-
?>

forms/GroupedDropdownField.php

-1
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,3 @@ function Field() {
5959
}
6060
}
6161

62-
?>

forms/HasManyComplexTableField.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,4 @@ function MarkingCheckbox() {
158158
}
159159
}
160160

161-
?>
161+

forms/HasOneComplexTableField.php

-1
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,3 @@ function MarkingCheckbox() {
100100
}
101101
}
102102

103-
?>

forms/InlineFormAction.php

-1
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,3 @@ function Title() {
6767
return false;
6868
}
6969
}
70-
?>

forms/ListboxField.php

-1
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,3 @@ function setValue($val) {
183183
}
184184

185185
}
186-
?>

forms/LookupField.php

-1
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,3 @@ function getSource() {
6868
}
6969
}
7070

71-
?>

forms/ManyManyComplexTableField.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,4 @@ function MarkingCheckbox() {
103103
}
104104
}
105105

106-
?>
106+

forms/MoneyField.php

-1
Original file line numberDiff line numberDiff line change
@@ -165,4 +165,3 @@ function getLocale() {
165165
return $this->_locale;
166166
}
167167
}
168-
?>

forms/NumericField.php

-1
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,3 @@ function dataValue() {
7373
return (is_numeric($this->value)) ? $this->value : 0;
7474
}
7575
}
76-
?>

forms/PasswordField.php

-1
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,3 @@ function Type() {
4141
}
4242
}
4343

44-
?>

forms/PhoneNumberField.php

-1
Original file line numberDiff line numberDiff line change
@@ -191,4 +191,3 @@ function validate($validator){
191191
return true;
192192
}
193193
}
194-
?>

forms/PrintableTransformation.php

-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,3 @@ function FieldHolder() {
4040

4141
}
4242

43-
?>

forms/ReadonlyTransformation.php

-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@ class ReadonlyTransformation extends FormTransformation {
99
// methods on the individual FormField objects.
1010
}
1111

12-
?>

0 commit comments

Comments
 (0)