Skip to content

Commit d16051e

Browse files
mamenmamen
committed
- added autoloading
- updated naming-convention
1 parent 3653cae commit d16051e

Some content is hidden

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

63 files changed

+545
-574
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ core/config.php
44
./test*.php
55
*todo.*
66

7+
phar/*
8+
79
.DS_Store

‎codestyle.xml‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
11
<code_scheme name="Project" version="173">
2-
<PHPCodeStyleSettings>
3-
<option name="INDENT_CODE_IN_PHP_TAGS" value="true" />
4-
<option name="ALIGN_KEY_VALUE_PAIRS" value="true" />
5-
<option name="ALIGN_PHPDOC_PARAM_NAMES" value="true" />
6-
<option name="ALIGN_PHPDOC_COMMENTS" value="true" />
7-
<option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
8-
<option name="LOWER_CASE_NULL_CONST" value="true" />
9-
<option name="ELSE_IF_STYLE" value="SEPARATE" />
10-
<option name="VARIABLE_NAMING_STYLE" value="CAMEL_CASE" />
11-
<option name="BLANK_LINES_BEFORE_RETURN_STATEMENT" value="1" />
12-
<option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
13-
<option name="ALIGN_CLASS_CONSTANTS" value="true" />
14-
<option name="BLANK_LINES_AFTER_OPENING_TAG" value="1" />
15-
<option name="SPACE_BETWEEN_TERNARY_QUEST_AND_COLON" value="true" />
16-
<option name="SPACE_AROUND_ASSIGNMENT_IN_DECLARE" value="true" />
17-
<option name="SPACE_BEFORE_COLON_IN_RETURN_TYPE" value="true" />
18-
</PHPCodeStyleSettings>
19-
<codeStyleSettings language="PHP">
20-
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
21-
<option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
22-
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
23-
<option name="BLANK_LINES_AFTER_PACKAGE" value="1" />
24-
<option name="BLANK_LINES_AROUND_FIELD" value="1" />
25-
<option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
26-
<option name="CLASS_BRACE_STYLE" value="1" />
27-
<option name="METHOD_BRACE_STYLE" value="1" />
28-
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
29-
<option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
30-
<option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
31-
<option name="CALL_PARAMETERS_WRAP" value="1" />
32-
<option name="METHOD_PARAMETERS_WRAP" value="1" />
33-
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
34-
<option name="METHOD_CALL_CHAIN_WRAP" value="1" />
35-
<option name="ARRAY_INITIALIZER_WRAP" value="5" />
36-
<option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
37-
<option name="IF_BRACE_FORCE" value="3" />
38-
<option name="DOWHILE_BRACE_FORCE" value="3" />
39-
<option name="WHILE_BRACE_FORCE" value="3" />
40-
<option name="FOR_BRACE_FORCE" value="3" />
41-
<arrangement>
42-
<groups>
43-
<group>
44-
<type>GETTERS_AND_SETTERS</type>
45-
<order>KEEP</order>
46-
</group>
47-
<group>
48-
<type>DEPENDENT_METHODS</type>
49-
<order>DEPTH_FIRST</order>
50-
</group>
51-
<group>
52-
<type>OVERRIDDEN_METHODS</type>
53-
<order>KEEP</order>
54-
</group>
55-
</groups>
56-
</arrangement>
57-
</codeStyleSettings>
2+
<PHPCodeStyleSettings>
3+
<option name="INDENT_CODE_IN_PHP_TAGS" value="true"/>
4+
<option name="ALIGN_KEY_VALUE_PAIRS" value="true"/>
5+
<option name="ALIGN_PHPDOC_PARAM_NAMES" value="true"/>
6+
<option name="ALIGN_PHPDOC_COMMENTS" value="true"/>
7+
<option name="LOWER_CASE_BOOLEAN_CONST" value="true"/>
8+
<option name="LOWER_CASE_NULL_CONST" value="true"/>
9+
<option name="ELSE_IF_STYLE" value="SEPARATE"/>
10+
<option name="VARIABLE_NAMING_STYLE" value="CAMEL_CASE"/>
11+
<option name="BLANK_LINES_BEFORE_RETURN_STATEMENT" value="1"/>
12+
<option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true"/>
13+
<option name="ALIGN_CLASS_CONSTANTS" value="true"/>
14+
<option name="BLANK_LINES_AFTER_OPENING_TAG" value="1"/>
15+
<option name="SPACE_BETWEEN_TERNARY_QUEST_AND_COLON" value="true"/>
16+
<option name="SPACE_AROUND_ASSIGNMENT_IN_DECLARE" value="true"/>
17+
<option name="SPACE_BEFORE_COLON_IN_RETURN_TYPE" value="true"/>
18+
</PHPCodeStyleSettings>
19+
<codeStyleSettings language="PHP">
20+
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false"/>
21+
<option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false"/>
22+
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1"/>
23+
<option name="BLANK_LINES_AFTER_PACKAGE" value="1"/>
24+
<option name="BLANK_LINES_AROUND_FIELD" value="1"/>
25+
<option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1"/>
26+
<option name="CLASS_BRACE_STYLE" value="1"/>
27+
<option name="METHOD_BRACE_STYLE" value="1"/>
28+
<option name="ALIGN_MULTILINE_PARAMETERS" value="false"/>
29+
<option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true"/>
30+
<option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true"/>
31+
<option name="CALL_PARAMETERS_WRAP" value="1"/>
32+
<option name="METHOD_PARAMETERS_WRAP" value="1"/>
33+
<option name="EXTENDS_KEYWORD_WRAP" value="1"/>
34+
<option name="METHOD_CALL_CHAIN_WRAP" value="1"/>
35+
<option name="ARRAY_INITIALIZER_WRAP" value="5"/>
36+
<option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true"/>
37+
<option name="IF_BRACE_FORCE" value="3"/>
38+
<option name="DOWHILE_BRACE_FORCE" value="3"/>
39+
<option name="WHILE_BRACE_FORCE" value="3"/>
40+
<option name="FOR_BRACE_FORCE" value="3"/>
41+
<arrangement>
42+
<groups>
43+
<group>
44+
<type>GETTERS_AND_SETTERS</type>
45+
<order>KEEP</order>
46+
</group>
47+
<group>
48+
<type>DEPENDENT_METHODS</type>
49+
<order>DEPTH_FIRST</order>
50+
</group>
51+
<group>
52+
<type>OVERRIDDEN_METHODS</type>
53+
<order>KEEP</order>
54+
</group>
55+
</groups>
56+
</arrangement>
57+
</codeStyleSettings>
5858
</code_scheme>

‎core/autoload.php‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?php
2+
3+
function __autoload($className) {
4+
global $path;
5+
6+
7+
$s = explode("_", $className);
8+
9+
$p = "";
10+
11+
switch ($s[0]) {
12+
case "Data":
13+
$p = $path['data'] . strtolower($s[1]) . '.php';
14+
break;
15+
case "Unit":
16+
$p = $path['units'] . strtolower($s[1]) . '.php';
17+
break;
18+
case "C":
19+
$p = $path['controllers'] . strtolower($s[1]) . '.php';
20+
break;
21+
case "I":
22+
$p = $path['interfaces'] . strtolower($s[1]) . '.php';
23+
break;
24+
case "V":
25+
$p = $path['views'] . strtolower($s[1]) . '.php';
26+
break;
27+
case "M":
28+
$p = $path['models'] . strtolower($s[1]) . '.php';
29+
break;
30+
case "Loader":
31+
$p = $path['classes'] . strtolower($s[0]) . '.php';
32+
break;
33+
case "Database":
34+
$p = $path['classes'] . 'db.php';
35+
break;
36+
}
37+
38+
if (file_exists($p)) {
39+
require_once $p;
40+
}
41+
42+
43+
}

core/classes/data/buildingData.php renamed to core/classes/data/building.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
defined('INSIDE') OR exit('No direct script access allowed');
66

7-
class BuildingData {
7+
class Data_Building {
88

99
private $metal_mine;
1010

core/classes/data/defenseData.php renamed to core/classes/data/defense.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
defined('INSIDE') OR exit('No direct script access allowed');
66

7-
class DefenseData {
7+
class Data_Defense {
88

99
private $rocket_launcher;
1010

core/classes/data/fleetData.php renamed to core/classes/data/fleet.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
defined('INSIDE') OR exit('No direct script access allowed');
66

7-
class FleetData {
7+
class Data_Fleet {
88

99
private $small_cargo_ship;
1010

core/classes/data/galaxyData.php renamed to core/classes/data/galaxy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
defined('INSIDE') OR exit('No direct script access allowed');
66

7-
class GalaxyData {
7+
class Data_Galaxy {
88

99
private $debris_metal;
1010

core/classes/data/planetData.php renamed to core/classes/data/planet.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
declare(strict_types = 1);
44

55

6-
76
defined('INSIDE') OR exit('No direct script access allowed');
87

9-
class PlanetData {
8+
class Data_Planet {
109

1110
private $planetID;
1211

core/classes/data/techData.php renamed to core/classes/data/tech.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
defined('INSIDE') OR exit('No direct script access allowed');
66

7-
class TechData {
7+
class Data_Tech {
88

99
private $espionage_tech;
1010

core/classes/data/unitsData.php renamed to core/classes/data/units.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
defined('INSIDE') OR exit('No direct script access allowed');
66

7-
8-
class UnitsData {
7+
class Data_Units {
98

109
private $units;
1110

0 commit comments

Comments
 (0)