IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Updated various files after upgrade to laravel 5.2

Browse Source
This commit is contained in:
James Cole 2016-01-08 16:09:51 +01:00
parent 8c37ef3a95
commit d6b47656bc
6 changed files with 1540 additions and 457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
composer.json Normal file → Executable file
View File

@ -1,68 +1,71 @@
{ {
"name": "grumpydictator/firefly-iii", "name": "grumpydictator/firefly-iii",
"description": "Firefly III: a personal finances manager.", "description": "Firefly III: a personal finances manager.",
"keywords": ["finance", "finances", "manager", "euro", "laravel", "money", "financials", "budgets", "transactions", "transfers", "management"], "keywords": ["finance", "finances", "manager", "euro", "laravel", "money", "financials", "budgets", "transactions", "transfers", "management"],
"license": "MIT", "license": "MIT",
"homepage": "https://github.com/JC5/firefly-iii", "homepage": "https://github.com/JC5/firefly-iii",
"type": "project", "type": "project",
"authors": [ "authors": [
{ {
"name": "James Cole", "name": "James Cole",
"email": "thegrumpydictator@gmail.com", "email": "thegrumpydictator@gmail.com",
"homepage": "https://github.com/JC5", "homepage": "https://github.com/JC5",
"role": "Developer" "role": "Developer"
} }],
],
"support": {
"email": "thegrumpydictator@gmail.com",
"issues": "https://github.com/JC5/firefly-iii/issues?state=open",
"source": "https://github.com/JC5/firefly-iii"
}, "require": {
"require": { "php": ">=5.6.11",
"laravel/framework": "5.1.*", "laravel/framework": "5.2.*",
"php": ">=5.6.4", "davejamesmiller/laravel-breadcrumbs": "~3.0",
"davejamesmiller/laravel-breadcrumbs": "~3.0", "watson/validating": "~2.0",
"watson/validating": "~1.0", "doctrine/dbal": "~2.5",
"doctrine/dbal": "~2.5", "league/commonmark": "~0.7",
"illuminate/html": "~5.0", "rcrowe/twigbridge": "~0.9",
"league/commonmark": "~0.7", "zizaco/entrust": "dev-laravel-5",
"rcrowe/twigbridge": "~0.9", "league/csv": "^7.1",
"zizaco/entrust": "dev-laravel-5", "laravelcollective/html": "^5.2"
"league/csv": "^7.1" },
}, "require-dev": {
"require-dev": { "fzaninotto/faker": "~1.4",
"barryvdh/laravel-debugbar": "@stable", "mockery/mockery": "0.9.*",
"barryvdh/laravel-ide-helper": "~2.0" "phpunit/phpunit": "~4.0",
}, "symfony/css-selector": "2.8.*|3.0.*",
"autoload": { "symfony/dom-crawler": "2.8.*|3.0.*",
"classmap": [ "barryvdh/laravel-debugbar": "@stable",
"database" "barryvdh/laravel-ide-helper": "~2.0"
], },
"psr-4": { "autoload": {
"FireflyIII\\": "app/" "classmap": [
} "database"
}, ],
"autoload-dev": { "psr-4": {
"classmap": [ "FireflyIII\\": "app/"
"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"
} }
},
"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
View File

File diff suppressed because it is too large Load Diff

6
gulpfile.js Normal file → Executable file
View File

@ -1,4 +1,3 @@
/* globals require */
var elixir = require('laravel-elixir'); 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 | 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. | file for our application, as well as publishing vendor resources.
| |
*/ */
elixir(function(mix) { elixir(function(mix) {
"use strict"; mix.sass('app.scss');
mix.less('app.less');
}); });

8
package.json Normal file → Executable file
View File

@ -1,6 +1,10 @@
{ {
"private": true,
"devDependencies": { "devDependencies": {
"gulp": "^3.8.8", "gulp": "^3.8.8"
"laravel-elixir": "*" },
"dependencies": {
"laravel-elixir": "^4.0.0",
"bootstrap-sass": "^3.0.0"
} }
} }

14
phpunit.xml Normal file → Executable file
View File

@ -7,25 +7,17 @@
convertNoticesToExceptions="true" convertNoticesToExceptions="true"
convertWarningsToExceptions="true" convertWarningsToExceptions="true"
processIsolation="false" processIsolation="false"
stopOnFailure="true" stopOnFailure="false">
syntaxCheck="false">
<testsuites> <testsuites>
<testsuite name="Application Test Suite"> <testsuite name="Application Test Suite">
<directory>./tests</directory> <directory>./tests/</directory>
</testsuite> </testsuite>
</testsuites> </testsuites>
<filter> <filter>
<whitelist> <whitelist>
<directory suffix=".php">./app</directory> <directory suffix=".php">app/</directory>
</whitelist> </whitelist>
</filter> </filter>
<!-- code coverage
<logging>
<log type="coverage-clover" target="./build/logs/clover.xml" charset="UTF-8" />
</logging>
-->
<php> <php>
<env name="APP_ENV" value="testing"/> <env name="APP_ENV" value="testing"/>
<env name="CACHE_DRIVER" value="array"/> <env name="CACHE_DRIVER" value="array"/>

5
server.php Normal file → Executable file
View File

@ -1,4 +1,5 @@
<?php <?php
/** /**
* Laravel - A PHP Framework For Web Artisans * 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 // 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 // built-in PHP web server. This provides a convenient way to test a Laravel
// application without having installed a "real" web server software here. // 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; return false;
} }
require_once __DIR__ . '/public/index.php'; require_once __DIR__.'/public/index.php';