@@ -7,7 +7,7 @@ |
||
| 7 | 7 | |
| 8 | 8 | class ProPlayerValidatorTest extends TestCase { |
| 9 | 9 | function setUp() { |
| 10 | - $this->app = require dirname(__FILE__).'/../../../../api/config/_app.php'; |
|
| 10 | + $this->app = require dirname(__FILE__) . '/../../../../api/config/_app.php'; |
|
| 11 | 11 | $draftDataRepository = new DraftDataRepository($this->app); |
| 12 | 12 | $this->sut = new ProPlayerValidator($this->app); |
| 13 | 13 | $this->app['phpdraft.DraftDataRepository'] = $draftDataRepository; |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | |
| 12 | 12 | class TradeValidatorTest extends TestCase { |
| 13 | 13 | function setUp() { |
| 14 | - $this->app = require dirname(__FILE__).'/../../../../api/config/_app.php'; |
|
| 14 | + $this->app = require dirname(__FILE__) . '/../../../../api/config/_app.php'; |
|
| 15 | 15 | $this->draft = new Draft(); |
| 16 | 16 | $this->trade = new Trade(); |
| 17 | 17 | $this->trade->manager1 = new Manager(); |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | $items_required_for_packaging = [ |
| 19 | 19 | 'app', |
| 20 | 20 | 'db', |
| 21 | - 'deploy', |
|
| 21 | + 'deploy', |
|
| 22 | 22 | 'gulp' |
| 23 | 23 | ]; |
| 24 | 24 | |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | 'db', |
| 96 | 96 | 'deploy', |
| 97 | 97 | 'fonts', |
| 98 | - 'images', |
|
| 98 | + 'images', |
|
| 99 | 99 | 'vendor', |
| 100 | 100 | 'js' |
| 101 | 101 | ]; |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | 'composer.json', |
| 106 | 106 | 'composer.lock', |
| 107 | 107 | 'README.MD', |
| 108 | - 'package.json', |
|
| 108 | + 'package.json', |
|
| 109 | 109 | 'index.html', |
| 110 | 110 | 'web.config' |
| 111 | 111 | ]; |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | $archivePath = get('phpdraft')['releasePath']; |
| 115 | 115 | |
| 116 | 116 | foreach($phpdraft_release_dirs as $archiveDirectory) { |
| 117 | - runLocally("7z a $archivePath/$releaseFileName $archiveDirectory"); |
|
| 117 | + runLocally("7z a $archivePath/$releaseFileName $archiveDirectory"); |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | foreach($phpdraft_release_files as $archiveFile) { |
@@ -122,16 +122,16 @@ discard block |
||
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | //Hard-coded so we copy a working deploy.php so no one technically needs to edit a single file |
| 125 | - runLocally("7z a $archivePath/$releaseFileName deploy/deploy.php.release"); |
|
| 126 | - runLocally("7z a $archivePath/$releaseFileName deploy/appsettings.php.ci"); |
|
| 127 | - runLocally("7z a $archivePath/$releaseFileName deploy/phinx.yml.ci"); |
|
| 128 | - runLocally("7z rn $archivePath/$releaseFileName deploy/deploy.php.release deploy.php"); |
|
| 129 | - runLocally("7z rn $archivePath/$releaseFileName deploy/appsettings.php.ci appsettings.php"); |
|
| 130 | - runLocally("7z rn $archivePath/$releaseFileName deploy/phinx.yml.ci phinx.yml"); |
|
| 131 | - |
|
| 132 | - //Re-include them in case anyone using this packaged release needs CI versions of these! |
|
| 133 | - runLocally("7z a $archivePath/$releaseFileName deploy/appsettings.php.ci"); |
|
| 134 | - runLocally("7z a $archivePath/$releaseFileName deploy/phinx.yml.ci"); |
|
| 125 | + runLocally("7z a $archivePath/$releaseFileName deploy/deploy.php.release"); |
|
| 126 | + runLocally("7z a $archivePath/$releaseFileName deploy/appsettings.php.ci"); |
|
| 127 | + runLocally("7z a $archivePath/$releaseFileName deploy/phinx.yml.ci"); |
|
| 128 | + runLocally("7z rn $archivePath/$releaseFileName deploy/deploy.php.release deploy.php"); |
|
| 129 | + runLocally("7z rn $archivePath/$releaseFileName deploy/appsettings.php.ci appsettings.php"); |
|
| 130 | + runLocally("7z rn $archivePath/$releaseFileName deploy/phinx.yml.ci phinx.yml"); |
|
| 131 | + |
|
| 132 | + //Re-include them in case anyone using this packaged release needs CI versions of these! |
|
| 133 | + runLocally("7z a $archivePath/$releaseFileName deploy/appsettings.php.ci"); |
|
| 134 | + runLocally("7z a $archivePath/$releaseFileName deploy/phinx.yml.ci"); |
|
| 135 | 135 | })->setPrivate(); |
| 136 | 136 | |
| 137 | 137 | desc('Package resources with 7zip'); |
@@ -22,8 +22,8 @@ discard block |
||
| 22 | 22 | 'gulp' |
| 23 | 23 | ]; |
| 24 | 24 | |
| 25 | - foreach($items_required_for_packaging as $directory) { |
|
| 26 | - if(file_exists($directory) !== true) { |
|
| 25 | + foreach ($items_required_for_packaging as $directory) { |
|
| 26 | + if (file_exists($directory) !== true) { |
|
| 27 | 27 | writeln("<error>Directory $directory does not exist, cannot package.</error>\n"); |
| 28 | 28 | writeln("<error>In order to package a release, you must start with sourcecode from the Github repository, not from a prepackaged release from the Github Releases (you've apparently done it backwards :) )</error>\n"); |
| 29 | 29 | throw new \Exception("PHP Draft cannot be packaged for release."); |
@@ -32,14 +32,14 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | $yarn_output = runLocally('yarn -v'); |
| 34 | 34 | |
| 35 | - if(strpos($yarn_output, '.') == false) { |
|
| 35 | + if (strpos($yarn_output, '.') == false) { |
|
| 36 | 36 | writeln('<error>Yarn not found on path. Install Yarn globally for commandline use</error>'); |
| 37 | 37 | throw new \Exception("PHP Draft cannot be packaged for release"); |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | $sevenZip_output = runLocally('7z'); |
| 41 | 41 | |
| 42 | - if(strpos($sevenZip_output, 'Igor Pavlov') == false) { |
|
| 42 | + if (strpos($sevenZip_output, 'Igor Pavlov') == false) { |
|
| 43 | 43 | writeln('<error>7-Zip not found on path. Install 7-Zip for commandline use</error>'); |
| 44 | 44 | throw new \Exception("PHP Draft cannot be packaged for release"); |
| 45 | 45 | } |
@@ -48,11 +48,11 @@ discard block |
||
| 48 | 48 | $resourceFileName = get('phpdraft')['resourceFile']; |
| 49 | 49 | $archivePath = get('phpdraft')['releasePath']; |
| 50 | 50 | |
| 51 | - if(file_exists("$archivePath/$releaseFileName")) { |
|
| 51 | + if (file_exists("$archivePath/$releaseFileName")) { |
|
| 52 | 52 | throw new \Exception("File $archivePath/$releaseFileName already exists."); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - if(file_exists("$archivePath/$resourceFileName")) { |
|
| 55 | + if (file_exists("$archivePath/$resourceFileName")) { |
|
| 56 | 56 | throw new \Exception("File $archivePath/$resourceFileName already exists."); |
| 57 | 57 | } |
| 58 | 58 | })->setPrivate(); |
@@ -113,11 +113,11 @@ discard block |
||
| 113 | 113 | $releaseFileName = get('phpdraft')['releaseFile']; |
| 114 | 114 | $archivePath = get('phpdraft')['releasePath']; |
| 115 | 115 | |
| 116 | - foreach($phpdraft_release_dirs as $archiveDirectory) { |
|
| 116 | + foreach ($phpdraft_release_dirs as $archiveDirectory) { |
|
| 117 | 117 | runLocally("7z a $archivePath/$releaseFileName $archiveDirectory"); |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | - foreach($phpdraft_release_files as $archiveFile) { |
|
| 120 | + foreach ($phpdraft_release_files as $archiveFile) { |
|
| 121 | 121 | runLocally("7z a $archivePath/$releaseFileName $archiveFile"); |
| 122 | 122 | } |
| 123 | 123 | |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | $resourceFileName = get('phpdraft')['resourceFile']; |
| 145 | 145 | $archivePath = get('phpdraft')['releasePath']; |
| 146 | 146 | |
| 147 | - foreach($goodResources as $resourceFile) { |
|
| 147 | + foreach ($goodResources as $resourceFile) { |
|
| 148 | 148 | runLocally("7z a $archivePath/$resourceFileName $phpdraft_resource_dir/$resourceFile"); |
| 149 | 149 | } |
| 150 | 150 | })->setPrivate(); |