mirror of
				https://github.com/BookStackApp/BookStack.git
				synced 2025-11-03 02:13:16 +03:00 
			
		
		
		
	Made some further laravel 5.5 cleanup
Removed old bootstrap files that are not needed and amended composer to laravel upgrade guide
This commit is contained in:
		@@ -15,7 +15,6 @@ before_script:
 | 
				
			|||||||
  - mysql -u root -e "GRANT ALL ON \`bookstack-test\`.* TO 'bookstack-test'@'localhost';"
 | 
					  - mysql -u root -e "GRANT ALL ON \`bookstack-test\`.* TO 'bookstack-test'@'localhost';"
 | 
				
			||||||
  - mysql -u root -e "FLUSH PRIVILEGES;"
 | 
					  - mysql -u root -e "FLUSH PRIVILEGES;"
 | 
				
			||||||
  - phpenv config-rm xdebug.ini
 | 
					  - phpenv config-rm xdebug.ini
 | 
				
			||||||
  - composer dump-autoload --no-interaction
 | 
					 | 
				
			||||||
  - composer install --prefer-dist --no-interaction
 | 
					  - composer install --prefer-dist --no-interaction
 | 
				
			||||||
  - php artisan clear-compiled -n
 | 
					  - php artisan clear-compiled -n
 | 
				
			||||||
  - php artisan optimize -n
 | 
					  - php artisan optimize -n
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										6
									
								
								artisan
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								artisan
									
									
									
									
									
								
							@@ -1,6 +1,8 @@
 | 
				
			|||||||
#!/usr/bin/env php
 | 
					#!/usr/bin/env php
 | 
				
			||||||
<?php
 | 
					<?php
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					define('LARAVEL_START', microtime(true));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
|--------------------------------------------------------------------------
 | 
					|--------------------------------------------------------------------------
 | 
				
			||||||
| Register The Auto Loader
 | 
					| Register The Auto Loader
 | 
				
			||||||
@@ -13,7 +15,7 @@
 | 
				
			|||||||
|
 | 
					|
 | 
				
			||||||
*/
 | 
					*/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
require __DIR__.'/bootstrap/autoload.php';
 | 
					require __DIR__.'/vendor/autoload.php';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
$app = require_once __DIR__.'/bootstrap/app.php';
 | 
					$app = require_once __DIR__.'/bootstrap/app.php';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -40,7 +42,7 @@ $status = $kernel->handle(
 | 
				
			|||||||
| Shutdown The Application
 | 
					| Shutdown The Application
 | 
				
			||||||
|--------------------------------------------------------------------------
 | 
					|--------------------------------------------------------------------------
 | 
				
			||||||
|
 | 
					|
 | 
				
			||||||
| Once Artisan has finished running. We will fire off the shutdown events
 | 
					| Once Artisan has finished running, we will fire off the shutdown events
 | 
				
			||||||
| so that any final work may be done by the application before we shut
 | 
					| so that any final work may be done by the application before we shut
 | 
				
			||||||
| down the process. This is the last thing to happen to the request.
 | 
					| down the process. This is the last thing to happen to the request.
 | 
				
			||||||
|
 | 
					|
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,35 +0,0 @@
 | 
				
			|||||||
<?php
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
define('LARAVEL_START', microtime(true));
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/*
 | 
					 | 
				
			||||||
|--------------------------------------------------------------------------
 | 
					 | 
				
			||||||
| Register The Composer Auto Loader
 | 
					 | 
				
			||||||
|--------------------------------------------------------------------------
 | 
					 | 
				
			||||||
|
 | 
					 | 
				
			||||||
| Composer provides a convenient, automatically generated class loader
 | 
					 | 
				
			||||||
| for our application. We just need to utilize it! We'll require it
 | 
					 | 
				
			||||||
| into the script here so that we do not have to worry about the
 | 
					 | 
				
			||||||
| loading of any our classes "manually". Feels great to relax.
 | 
					 | 
				
			||||||
|
 | 
					 | 
				
			||||||
*/
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
require __DIR__.'/../app/helpers.php';
 | 
					 | 
				
			||||||
require __DIR__.'/../vendor/autoload.php';
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/*
 | 
					 | 
				
			||||||
|--------------------------------------------------------------------------
 | 
					 | 
				
			||||||
| Include The Compiled Class File
 | 
					 | 
				
			||||||
|--------------------------------------------------------------------------
 | 
					 | 
				
			||||||
|
 | 
					 | 
				
			||||||
| To dramatically increase your application's performance, you may use a
 | 
					 | 
				
			||||||
| compiled class file which contains all of the classes commonly used
 | 
					 | 
				
			||||||
| by a request. The Artisan "optimize" is used to create this file.
 | 
					 | 
				
			||||||
|
 | 
					 | 
				
			||||||
*/
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
$compiledPath = __DIR__.'/cache/compiled.php';
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
if (file_exists($compiledPath)) {
 | 
					 | 
				
			||||||
    require $compiledPath;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
@@ -59,13 +59,9 @@
 | 
				
			|||||||
            "php -r \"!file_exists('bootstrap/cache/compiled.php') || @unlink('bootstrap/cache/compiled.php');\""
 | 
					            "php -r \"!file_exists('bootstrap/cache/compiled.php') || @unlink('bootstrap/cache/compiled.php');\""
 | 
				
			||||||
        ],
 | 
					        ],
 | 
				
			||||||
        "post-install-cmd": [
 | 
					        "post-install-cmd": [
 | 
				
			||||||
            "Illuminate\\Foundation\\ComposerScripts::postInstall",
 | 
					 | 
				
			||||||
            "php artisan cache:clear",
 | 
					            "php artisan cache:clear",
 | 
				
			||||||
            "php artisan view:clear"
 | 
					            "php artisan view:clear"
 | 
				
			||||||
        ],
 | 
					        ],
 | 
				
			||||||
        "post-update-cmd": [
 | 
					 | 
				
			||||||
            "Illuminate\\Foundation\\ComposerScripts::postUpdate"
 | 
					 | 
				
			||||||
        ],
 | 
					 | 
				
			||||||
        "post-autoload-dump": [
 | 
					        "post-autoload-dump": [
 | 
				
			||||||
            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
 | 
					            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
 | 
				
			||||||
            "@php artisan package:discover"
 | 
					            "@php artisan package:discover"
 | 
				
			||||||
@@ -76,6 +72,7 @@
 | 
				
			|||||||
        ]
 | 
					        ]
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "config": {
 | 
					    "config": {
 | 
				
			||||||
 | 
					        "optimize-autoloader": true,
 | 
				
			||||||
        "preferred-install": "dist",
 | 
					        "preferred-install": "dist",
 | 
				
			||||||
        "php": "7.0"
 | 
					        "php": "7.0"
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,9 +4,11 @@
 | 
				
			|||||||
 * Laravel - A PHP Framework For Web Artisans
 | 
					 * Laravel - A PHP Framework For Web Artisans
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * @package  Laravel
 | 
					 * @package  Laravel
 | 
				
			||||||
 * @author   Taylor Otwell <taylorotwell@gmail.com>
 | 
					 * @author   Taylor Otwell <taylor@laravel.com>
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					define('LARAVEL_START', microtime(true));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
|--------------------------------------------------------------------------
 | 
					|--------------------------------------------------------------------------
 | 
				
			||||||
| Register The Auto Loader
 | 
					| Register The Auto Loader
 | 
				
			||||||
@@ -15,11 +17,11 @@
 | 
				
			|||||||
| Composer provides a convenient, automatically generated class loader for
 | 
					| Composer provides a convenient, automatically generated class loader for
 | 
				
			||||||
| our application. We just need to utilize it! We'll simply require it
 | 
					| our application. We just need to utilize it! We'll simply require it
 | 
				
			||||||
| into the script here so that we don't have to worry about manual
 | 
					| into the script here so that we don't have to worry about manual
 | 
				
			||||||
| loading any of our classes later on. It feels nice to relax.
 | 
					| loading any of our classes later on. It feels great to relax.
 | 
				
			||||||
|
 | 
					|
 | 
				
			||||||
*/
 | 
					*/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
require __DIR__.'/../bootstrap/autoload.php';
 | 
					require __DIR__.'/../vendor/autoload.php';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
|--------------------------------------------------------------------------
 | 
					|--------------------------------------------------------------------------
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user