Skip to content
This repository was archived by the owner on Mar 24, 2024. It is now read-only.

Commit 5ef7dfb

Browse files
committed
Merge pull request #7 from lbausch/laravel-5.1
Laravel 5.1
2 parents 669a893 + c473129 commit 5ef7dfb

File tree

11 files changed

+249
-241
lines changed

11 files changed

+249
-241
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ composer.lock
77

88
## Assets
99
/public/assets/min
10+
11+
## PhpStorm
12+
.idea/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Web interface for [SQLgrey](http://sqlgrey.sourceforge.net/) using the [Laravel
1616
## Requirements
1717
* working SQLgrey setup
1818
* Webserver (e.g. Apache) and Database (e.g. MySQL)
19-
* PHP >= 5.4.0
19+
* PHP >= 5.5.9
2020

2121

2222
## Installation in 7 simple steps

app/Commands/Command.php

Lines changed: 0 additions & 7 deletions
This file was deleted.

app/Jobs/Command.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?php namespace SQLgreyGUI\Jobs;
2+
3+
abstract class Command {
4+
5+
//
6+
7+
}
File renamed without changes.
File renamed without changes.

bootstrap/autoload.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@
2727
|
2828
*/
2929

30-
$compiledPath = __DIR__.'/../vendor/compiled.php';
30+
$compiledPath = __DIR__.'/cache/compiled.php';
3131

32-
if (file_exists($compiledPath))
33-
{
34-
require $compiledPath;
32+
if (file_exists($compiledPath)) {
33+
require $compiledPath;
3534
}

bootstrap/cache/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore

composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@
55
"license": "MIT",
66
"type": "project",
77
"require": {
8-
"laravel/framework": "5.0.*",
8+
"laravel/framework": "5.1.*",
99
"rcrowe/twigbridge": "0.7.x",
10-
"stolz/assets": "0.1.*",
11-
"laravelcollective/html": "~5.0",
10+
"stolz/assets": "^0.1.2",
11+
"laravelcollective/html": "5.1.*",
1212
"components/jquery": "dev-master",
1313
"twbs/bootstrap": "~3.3",
1414
"eonasdan/bootstrap-datetimepicker": "dev-master",
1515
"fortawesome/font-awesome": "4.3.0",
1616
"afarkas/html5shiv": "dev-master",
1717
"rogeriopradoj/respond": "1.4.2",
1818
"datatables/datatables": "dev-master",
19-
"spatie/laravel-tail": "dev-master"
19+
"spatie/laravel-tail": "dev-master",
20+
"roave/security-advisories": "dev-master"
2021
},
2122
"require-dev": {
2223
"phpunit/phpunit": "~4.0",

0 commit comments

Comments
 (0)