mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Updated various files after upgrade to laravel 5.2
This commit is contained in:
James Cole
parent
8c37ef3a95
commit
d6b47656bc
131
composer.json
Normal file → Executable file
131
composer.json
Normal file → Executable file
@ -1,68 +1,71 @@
|
||||
{
|
||||
"name": "grumpydictator/firefly-iii",
|
||||
"description": "Firefly III: a personal finances manager.",
|
||||
"keywords": ["finance", "finances", "manager", "euro", "laravel", "money", "financials", "budgets", "transactions", "transfers", "management"],
|
||||
"license": "MIT",
|
||||
"homepage": "https://github.com/JC5/firefly-iii",
|
||||
"type": "project",
|
||||
"authors": [
|
||||
{
|
||||
"name": "James Cole",
|
||||
"email": "thegrumpydictator@gmail.com",
|
||||
"homepage": "https://github.com/JC5",
|
||||
"role": "Developer"
|
||||
}
|
||||
],
|
||||
"support": {
|
||||
"email": "thegrumpydictator@gmail.com",
|
||||
"issues": "https://github.com/JC5/firefly-iii/issues?state=open",
|
||||
"source": "https://github.com/JC5/firefly-iii"
|
||||
"name": "grumpydictator/firefly-iii",
|
||||
"description": "Firefly III: a personal finances manager.",
|
||||
"keywords": ["finance", "finances", "manager", "euro", "laravel", "money", "financials", "budgets", "transactions", "transfers", "management"],
|
||||
"license": "MIT",
|
||||
"homepage": "https://github.com/JC5/firefly-iii",
|
||||
"type": "project",
|
||||
"authors": [
|
||||
{
|
||||
"name": "James Cole",
|
||||
"email": "thegrumpydictator@gmail.com",
|
||||
"homepage": "https://github.com/JC5",
|
||||
"role": "Developer"
|
||||
}],
|
||||
|
||||
},
|
||||
"require": {
|
||||
"laravel/framework": "5.1.*",
|
||||
"php": ">=5.6.4",
|
||||
"davejamesmiller/laravel-breadcrumbs": "~3.0",
|
||||
"watson/validating": "~1.0",
|
||||
"doctrine/dbal": "~2.5",
|
||||
"illuminate/html": "~5.0",
|
||||
"league/commonmark": "~0.7",
|
||||
"rcrowe/twigbridge": "~0.9",
|
||||
"zizaco/entrust": "dev-laravel-5",
|
||||
"league/csv": "^7.1"
|
||||
},
|
||||
"require-dev": {
|
||||
"barryvdh/laravel-debugbar": "@stable",
|
||||
"barryvdh/laravel-ide-helper": "~2.0"
|
||||
},
|
||||
"autoload": {
|
||||
"classmap": [
|
||||
"database"
|
||||
],
|
||||
"psr-4": {
|
||||
"FireflyIII\\": "app/"
|
||||
}
|
||||
},
|
||||
"autoload-dev": {
|
||||
"classmap": [
|
||||
"tests/TestCase.php"
|
||||
]
|
||||
},
|
||||
"scripts": {
|
||||
"post-install-cmd": [
|
||||
"php artisan clear-compiled",
|
||||
"php artisan optimize"
|
||||
],
|
||||
"post-update-cmd": [
|
||||
"php artisan clear-compiled",
|
||||
"php artisan optimize"
|
||||
],
|
||||
"post-create-project-cmd": [
|
||||
"php -r \"copy('.env.example', '.env');\"",
|
||||
"php artisan key:generate"
|
||||
]
|
||||
},
|
||||
"config": {
|
||||
"preferred-install": "dist"
|
||||
"require": {
|
||||
"php": ">=5.6.11",
|
||||
"laravel/framework": "5.2.*",
|
||||
"davejamesmiller/laravel-breadcrumbs": "~3.0",
|
||||
"watson/validating": "~2.0",
|
||||
"doctrine/dbal": "~2.5",
|
||||
"league/commonmark": "~0.7",
|
||||
"rcrowe/twigbridge": "~0.9",
|
||||
"zizaco/entrust": "dev-laravel-5",
|
||||
"league/csv": "^7.1",
|
||||
"laravelcollective/html": "^5.2"
|
||||
},
|
||||
"require-dev": {
|
||||
"fzaninotto/faker": "~1.4",
|
||||
"mockery/mockery": "0.9.*",
|
||||
"phpunit/phpunit": "~4.0",
|
||||
"symfony/css-selector": "2.8.*|3.0.*",
|
||||
"symfony/dom-crawler": "2.8.*|3.0.*",
|
||||
"barryvdh/laravel-debugbar": "@stable",
|
||||
"barryvdh/laravel-ide-helper": "~2.0"
|
||||
},
|
||||
"autoload": {
|
||||
"classmap": [
|
||||
"database"
|
||||
],
|
||||
"psr-4": {
|
||||
"FireflyIII\\": "app/"
|
||||
}
|
||||
},
|
||||
"autoload-dev": {
|
||||
"classmap": [
|
||||
"tests/TestCase.php"
|
||||
]
|
||||
},
|
||||
"scripts": {
|
||||
"post-root-package-install": [
|
||||
"php -r \"copy('.env.example', '.env');\""
|
||||
],
|
||||
"post-create-project-cmd": [
|
||||
"php artisan key:generate"
|
||||
],
|
||||
"post-install-cmd": [
|
||||
"php artisan clear-compiled",
|
||||
"php artisan optimize"
|
||||
],
|
||||
"pre-update-cmd": [
|
||||
"php artisan clear-compiled"
|
||||
],
|
||||
"post-update-cmd": [
|
||||
"php artisan optimize"
|
||||
]
|
||||
},
|
||||
"config": {
|
||||
"preferred-install": "dist"
|
||||
}
|
||||
}
|
||||
|
||||
1833
composer.lock
generated
1833
composer.lock
generated
File diff suppressed because it is too large
Load Diff
6
gulpfile.js
Normal file → Executable file
6
gulpfile.js
Normal file → Executable file
@ -1,4 +1,3 @@
|
||||
/* globals require */
|
||||
var elixir = require('laravel-elixir');
|
||||
|
||||
/*
|
||||
@ -7,12 +6,11 @@ var elixir = require('laravel-elixir');
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Elixir provides a clean, fluent API for defining some basic Gulp tasks
|
||||
| for your Laravel application. By default, we are compiling the Less
|
||||
| for your Laravel application. By default, we are compiling the Sass
|
||||
| file for our application, as well as publishing vendor resources.
|
||||
|
|
||||
*/
|
||||
|
||||
elixir(function(mix) {
|
||||
"use strict";
|
||||
mix.less('app.less');
|
||||
mix.sass('app.scss');
|
||||
});
|
||||
|
||||
8
package.json
Normal file → Executable file
8
package.json
Normal file → Executable file
@ -1,6 +1,10 @@
|
||||
{
|
||||
"private": true,
|
||||
"devDependencies": {
|
||||
"gulp": "^3.8.8",
|
||||
"laravel-elixir": "*"
|
||||
"gulp": "^3.8.8"
|
||||
},
|
||||
"dependencies": {
|
||||
"laravel-elixir": "^4.0.0",
|
||||
"bootstrap-sass": "^3.0.0"
|
||||
}
|
||||
}
|
||||
|
||||
14
phpunit.xml
Normal file → Executable file
14
phpunit.xml
Normal file → Executable file
@ -7,25 +7,17 @@
|
||||
convertNoticesToExceptions="true"
|
||||
convertWarningsToExceptions="true"
|
||||
processIsolation="false"
|
||||
stopOnFailure="true"
|
||||
syntaxCheck="false">
|
||||
stopOnFailure="false">
|
||||
<testsuites>
|
||||
<testsuite name="Application Test Suite">
|
||||
<directory>./tests</directory>
|
||||
<directory>./tests/</directory>
|
||||
</testsuite>
|
||||
</testsuites>
|
||||
<filter>
|
||||
<whitelist>
|
||||
<directory suffix=".php">./app</directory>
|
||||
<directory suffix=".php">app/</directory>
|
||||
</whitelist>
|
||||
</filter>
|
||||
|
||||
<!-- code coverage
|
||||
<logging>
|
||||
<log type="coverage-clover" target="./build/logs/clover.xml" charset="UTF-8" />
|
||||
</logging>
|
||||
-->
|
||||
|
||||
<php>
|
||||
<env name="APP_ENV" value="testing"/>
|
||||
<env name="CACHE_DRIVER" value="array"/>
|
||||
|
||||
5
server.php
Normal file → Executable file
5
server.php
Normal file → Executable file
@ -1,4 +1,5 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Laravel - A PHP Framework For Web Artisans
|
||||
*
|
||||
@ -13,8 +14,8 @@ $uri = urldecode(
|
||||
// This file allows us to emulate Apache's "mod_rewrite" functionality from the
|
||||
// built-in PHP web server. This provides a convenient way to test a Laravel
|
||||
// application without having installed a "real" web server software here.
|
||||
if ($uri !== '/' && file_exists(__DIR__ . '/public' . $uri)) {
|
||||
if ($uri !== '/' && file_exists(__DIR__.'/public'.$uri)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
require_once __DIR__ . '/public/index.php';
|
||||
require_once __DIR__.'/public/index.php';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user