From a84de5db7718a80dc433cda1dd94dd01842168f0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 15 May 2016 14:48:21 +0200 Subject: [PATCH] Enable caching. Remove stuff for development. --- CHANGELOG.md | 19 ++ _development/.coveralls.yml | 1 - _development/.csslintrc | 2 - _development/.eslintignore | 1 - _development/.eslintrc | 213 ------------ _development/.jshintrc | 22 -- _development/codesniffer/ruleset.xml | 27 -- _development/codestyle.xml | 322 ------------------ _development/cover.sh | 63 ---- _development/favicon.pxm | Bin 102164 -> 0 bytes _development/gulpfile.js | 16 - _development/phpmd/phpmd.xml | 55 --- _development/phpspec.yml | 5 - _development/phpunit.cover.xml | 63 ---- _development/phpunit.default.xml | 31 -- _development/phpunit.xml | 31 -- _development/pu.sh | 103 ------ _development/readme.txt | 1 - app/Http/Controllers/AccountController.php | 4 +- .../Controllers/Chart/AccountController.php | 8 +- .../Controllers/Chart/CategoryController.php | 2 +- .../Controllers/Chart/ReportController.php | 2 +- 22 files changed, 27 insertions(+), 964 deletions(-) delete mode 100644 _development/.coveralls.yml delete mode 100644 _development/.csslintrc delete mode 100644 _development/.eslintignore delete mode 100644 _development/.eslintrc delete mode 100644 _development/.jshintrc delete mode 100644 _development/codesniffer/ruleset.xml delete mode 100644 _development/codestyle.xml delete mode 100755 _development/cover.sh delete mode 100644 _development/favicon.pxm delete mode 100644 _development/gulpfile.js delete mode 100644 _development/phpmd/phpmd.xml delete mode 100644 _development/phpspec.yml delete mode 100644 _development/phpunit.cover.xml delete mode 100644 _development/phpunit.default.xml delete mode 100644 _development/phpunit.xml delete mode 100755 _development/pu.sh delete mode 100644 _development/readme.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 412b2d343d..0b5e4cf7af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,25 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] - No unreleased changes yet. +[3.9.0] +### Added +- @zjean has added code that allows you to force "https://"-URL's. +- @tonicospinelli has added Portuguese (Brazil) translations. +- Firefly III supports the *splitting* of transactions: + - A withdrawal (expense) can be split into multiple sub-transactions (with multiple destinations) + - Likewise for deposits (incomes). You can set multiple sources. + - Likewise for transfers. + +### Changed +- Update a lot of libraries. +- Big improvement to test data generation. +- Cleaned up many repositories. + +### Removed +- Front page boxes will no longer respond to credit card bills. + +### Fixed +- Many bugs ## [3.8.4] - 2016-04-24 ### Added diff --git a/_development/.coveralls.yml b/_development/.coveralls.yml deleted file mode 100644 index eb8e63b57e..0000000000 --- a/_development/.coveralls.yml +++ /dev/null @@ -1 +0,0 @@ -src_dir: . diff --git a/_development/.csslintrc b/_development/.csslintrc deleted file mode 100644 index aacba956e5..0000000000 --- a/_development/.csslintrc +++ /dev/null @@ -1,2 +0,0 @@ ---exclude-exts=.min.css ---ignore=adjoining-classes,box-model,ids,order-alphabetical,unqualified-attributes diff --git a/_development/.eslintignore b/_development/.eslintignore deleted file mode 100644 index 96212a3593..0000000000 --- a/_development/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -**/*{.,-}min.js diff --git a/_development/.eslintrc b/_development/.eslintrc deleted file mode 100644 index 9faa37508e..0000000000 --- a/_development/.eslintrc +++ /dev/null @@ -1,213 +0,0 @@ -ecmaFeatures: - modules: true - jsx: true - -env: - amd: true - browser: true - es6: true - jquery: true - node: true - -# http://eslint.org/docs/rules/ -rules: - # Possible Errors - comma-dangle: [2, never] - no-cond-assign: 2 - no-console: 0 - no-constant-condition: 2 - no-control-regex: 2 - no-debugger: 2 - no-dupe-args: 2 - no-dupe-keys: 2 - no-duplicate-case: 2 - no-empty: 2 - no-empty-character-class: 2 - no-ex-assign: 2 - no-extra-boolean-cast: 2 - no-extra-parens: 0 - no-extra-semi: 2 - no-func-assign: 2 - no-inner-declarations: [2, functions] - no-invalid-regexp: 2 - no-irregular-whitespace: 2 - no-negated-in-lhs: 2 - no-obj-calls: 2 - no-regex-spaces: 2 - no-sparse-arrays: 2 - no-unexpected-multiline: 2 - no-unreachable: 2 - use-isnan: 2 - valid-jsdoc: 0 - valid-typeof: 2 - - # Best Practices - accessor-pairs: 2 - block-scoped-var: 0 - complexity: [2, 6] - consistent-return: 0 - curly: 0 - default-case: 0 - dot-location: 0 - dot-notation: 0 - eqeqeq: 2 - guard-for-in: 2 - no-alert: 2 - no-caller: 2 - no-case-declarations: 2 - no-div-regex: 2 - no-else-return: 0 - no-empty-label: 2 - no-empty-pattern: 2 - no-eq-null: 2 - no-eval: 2 - no-extend-native: 2 - no-extra-bind: 2 - no-fallthrough: 2 - no-floating-decimal: 0 - no-implicit-coercion: 0 - no-implied-eval: 2 - no-invalid-this: 0 - no-iterator: 2 - no-labels: 0 - no-lone-blocks: 2 - no-loop-func: 2 - no-magic-number: 0 - no-multi-spaces: 0 - no-multi-str: 0 - no-native-reassign: 2 - no-new-func: 2 - no-new-wrappers: 2 - no-new: 2 - no-octal-escape: 2 - no-octal: 2 - no-proto: 2 - no-redeclare: 2 - no-return-assign: 2 - no-script-url: 2 - no-self-compare: 2 - no-sequences: 0 - no-throw-literal: 0 - no-unused-expressions: 2 - no-useless-call: 2 - no-useless-concat: 2 - no-void: 2 - no-warning-comments: 0 - no-with: 2 - radix: 2 - vars-on-top: 0 - wrap-iife: 2 - yoda: 0 - - # Strict - strict: 0 - - # Variables - init-declarations: 0 - no-catch-shadow: 2 - no-delete-var: 2 - no-label-var: 2 - no-shadow-restricted-names: 2 - no-shadow: 0 - no-undef-init: 2 - no-undef: 0 - no-undefined: 0 - no-unused-vars: 0 - no-use-before-define: 0 - - # Node.js and CommonJS - callback-return: 2 - global-require: 2 - handle-callback-err: 2 - no-mixed-requires: 0 - no-new-require: 0 - no-path-concat: 2 - no-process-exit: 2 - no-restricted-modules: 0 - no-sync: 0 - - # Stylistic Issues - array-bracket-spacing: 0 - block-spacing: 0 - brace-style: 0 - camelcase: 0 - comma-spacing: 0 - comma-style: 0 - computed-property-spacing: 0 - consistent-this: 0 - eol-last: 0 - func-names: 0 - func-style: 0 - id-length: 0 - id-match: 0 - indent: 0 - jsx-quotes: 0 - key-spacing: 0 - linebreak-style: 0 - lines-around-comment: 0 - max-depth: 0 - max-len: 0 - max-nested-callbacks: 0 - max-params: 0 - max-statements: [2, 30] - new-cap: 0 - new-parens: 0 - newline-after-var: 0 - no-array-constructor: 0 - no-bitwise: 0 - no-continue: 0 - no-inline-comments: 0 - no-lonely-if: 0 - no-mixed-spaces-and-tabs: 0 - no-multiple-empty-lines: 0 - no-negated-condition: 0 - no-nested-ternary: 0 - no-new-object: 0 - no-plusplus: 0 - no-restricted-syntax: 0 - no-spaced-func: 0 - no-ternary: 0 - no-trailing-spaces: 0 - no-underscore-dangle: 0 - no-unneeded-ternary: 0 - object-curly-spacing: 0 - one-var: 0 - operator-assignment: 0 - operator-linebreak: 0 - padded-blocks: 0 - quote-props: 0 - quotes: 0 - require-jsdoc: 0 - semi-spacing: 0 - semi: 0 - sort-vars: 0 - space-after-keywords: 0 - space-before-blocks: 0 - space-before-function-paren: 0 - space-before-keywords: 0 - space-in-parens: 0 - space-infix-ops: 0 - space-return-throw-case: 0 - space-unary-ops: 0 - spaced-comment: 0 - wrap-regex: 0 - - # ECMAScript 6 - arrow-body-style: 0 - arrow-parens: 0 - arrow-spacing: 0 - constructor-super: 0 - generator-star-spacing: 0 - no-arrow-condition: 0 - no-class-assign: 0 - no-const-assign: 0 - no-dupe-class-members: 0 - no-this-before-super: 0 - no-var: 0 - object-shorthand: 0 - prefer-arrow-callback: 0 - prefer-const: 0 - prefer-reflect: 0 - prefer-spread: 0 - prefer-template: 0 - require-yield: 0 diff --git a/_development/.jshintrc b/_development/.jshintrc deleted file mode 100644 index e6395a276a..0000000000 --- a/_development/.jshintrc +++ /dev/null @@ -1,22 +0,0 @@ -{ - "undef": true, - "unused": false, - "strict": true, - "browser": true, - "jquery": true, - "devel": true, - "globals": [ - "language", - "token", - "currencyCode", - "$", - "token", - "accountID", - "billID", - "currentMonthName", - "previousMonthName", - "nextMonthName", - "everything", - "moment" - ] -} \ No newline at end of file diff --git a/_development/codesniffer/ruleset.xml b/_development/codesniffer/ruleset.xml deleted file mode 100644 index 5a6a92bb44..0000000000 --- a/_development/codesniffer/ruleset.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/_development/codestyle.xml b/_development/codestyle.xml deleted file mode 100644 index 1429217c85..0000000000 --- a/_development/codestyle.xml +++ /dev/null @@ -1,322 +0,0 @@ - - diff --git a/_development/cover.sh b/_development/cover.sh deleted file mode 100755 index 6807f88c0a..0000000000 --- a/_development/cover.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash - -# set testing environment -cp .env.testing .env - -# set cover: -cp phpunit.cover.xml phpunit.xml - -# delete test databases: -if [ -f storage/database/testing.db ] -then - echo "Will not remove test db" - # rm storage/database/testing.db -fi - -if [ -f storage/database/testing-copy.db ] -then - echo "Will not remove test db" - # rm storage/database/testing-copy.db -fi - -# test! -if [ -z "$1" ] -then - echo "Running all tests..." - phpunit -fi - -# test selective.. -dirs=("acceptance/Controllers" "acceptance/Controllers/Auth" "acceptance/Controllers/Chart" "unit") -# -if [ ! -z "$1" ] -then - for i in "${dirs[@]}" - do - firstFile="./tests/$i/$1.php" - secondFile="./tests/$i/$1Test.php" - if [ -f "$firstFile" ] - then - # run it! - echo "Now running $firstFile" - phpunit $firstFile - result=$? - fi - if [ -f "$secondFile" ] - then - # run it! - echo "Now running $secondFile" - phpunit $secondFile - result=$? - fi - - - done -fi - -# restore .env file -cp .env.local .env - -# restore cover -cp phpunit.default.xml phpunit.xml - -exit ${result} \ No newline at end of file diff --git a/_development/favicon.pxm b/_development/favicon.pxm deleted file mode 100644 index 18998b1f1c967132475f208afa3b4b0979528322..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102164 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 diff --git a/_development/gulpfile.js b/_development/gulpfile.js deleted file mode 100644 index dc6f1ebb4e..0000000000 --- a/_development/gulpfile.js +++ /dev/null @@ -1,16 +0,0 @@ -var elixir = require('laravel-elixir'); - -/* - |-------------------------------------------------------------------------- - | Elixir Asset Management - |-------------------------------------------------------------------------- - | - | Elixir provides a clean, fluent API for defining some basic Gulp tasks - | for your Laravel application. By default, we are compiling the Sass - | file for our application, as well as publishing vendor resources. - | - */ - -elixir(function(mix) { - mix.sass('app.scss'); -}); diff --git a/_development/phpmd/phpmd.xml b/_development/phpmd/phpmd.xml deleted file mode 100644 index 1e24a5344d..0000000000 --- a/_development/phpmd/phpmd.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - Bla bla - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/_development/phpspec.yml b/_development/phpspec.yml deleted file mode 100644 index 1f6a86a520..0000000000 --- a/_development/phpspec.yml +++ /dev/null @@ -1,5 +0,0 @@ -suites: - main: - namespace: FireflyIII - psr4_prefix: FireflyIII - src_path: app diff --git a/_development/phpunit.cover.xml b/_development/phpunit.cover.xml deleted file mode 100644 index 08ba731694..0000000000 --- a/_development/phpunit.cover.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - ./tests/ - - - - - app/Http - - - vendor/ - app/Console - app/Events - app/Exceptions - app/Generator - app/Handlers - app/Helpers - - app/Jobs - app/Listeners - app/Models - app/Policies - app/Providers - app/Repositories - app/Rules - app/Sql - app/Support - app/Validation - - - - - - - - - - - - - - - diff --git a/_development/phpunit.default.xml b/_development/phpunit.default.xml deleted file mode 100644 index 31ac89bcfe..0000000000 --- a/_development/phpunit.default.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - ./tests/ - - - - - app/ - - - - - - - - - - - - - diff --git a/_development/phpunit.xml b/_development/phpunit.xml deleted file mode 100644 index 31ac89bcfe..0000000000 --- a/_development/phpunit.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - ./tests/ - - - - - app/ - - - - - - - - - - - - - diff --git a/_development/pu.sh b/_development/pu.sh deleted file mode 100755 index e368f8b520..0000000000 --- a/_development/pu.sh +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/bash - -searchFile="" -deleteDatabases=false - -while getopts ":nhf:" opt; do - case $opt in - n) - # echo "-n was triggered: new database!" >&2 - deleteDatabases=true - ;; - f) - #echo "-f was triggered: file! $OPTARG" >&2 - searchFile=$OPTARG - ;; - h) - echo "n: new database" >&2 - echo "f: which file to run" >&2 - ;; - :) - echo "Option -$OPTARG requires an argument." >&2 - exit 1 - ;; - \?) - echo "Invalid option: -$OPTARG" >&2 - exit 1 - ;; - esac -done - -# set testing environment -cp .env.testing .env - -# set default phpunit. -cp phpunit.default.xml phpunit.xml - -# "create" default attachment: -touch storage/upload/at-1.data -touch storage/upload/at-2.data - -# delete databses: -if [ "$deleteDatabases" = true ] ; then - echo "Will delete and recreate the databases." - - # delete test database: - if [ -f storage/database/testing.db ] - then - echo "Deleted testing.db" - rm storage/database/testing.db - fi - - # delete test database copy: - if [ -f storage/database/testing-copy.db ] - then - echo "Delete testing-copy.db" - rm storage/database/testing-copy.db - fi -fi - -# do not delete database: -if [ "$deleteDatabases" = false ] ; then - echo "Will not delete databases." -fi - -# test! -if [ "$searchFile" == "" ] -then - echo "Running all tests..." - phpunit - result=$? -fi - -# test selective.. -dirs=("acceptance/Controllers" "acceptance/Controllers/Auth" "acceptance/Controllers/Chart" "unit") -# -if [ "$searchFile" != "" ] -then - echo "Will run test for '$searchFile'" - for i in "${dirs[@]}" - do - firstFile="./tests/$i/$searchFile.php" - secondFile="./tests/$i/"$searchFile"Test.php" - if [ -f "$firstFile" ] - then - # run it! - echo "Found file '$firstFile'" - phpunit --verbose $firstFile - result=$? - fi - if [ -f "$secondFile" ] - then - # run it! - echo "Found file '$secondFile'" - phpunit --verbose $secondFile - result=$? - fi - done -fi - -# restore .env file -cp .env.local .env - -exit ${result} \ No newline at end of file diff --git a/_development/readme.txt b/_development/readme.txt deleted file mode 100644 index f80cca7765..0000000000 --- a/_development/readme.txt +++ /dev/null @@ -1 +0,0 @@ -These are some of the files I use for code formatting, PHPMD and PHPCS. diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 3920a95155..5233e5afeb 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -250,8 +250,8 @@ class AccountController extends Controller if ($cache->has()) { - //$entries = $cache->get(); - //return view('categories.show', compact('category', 'journals', 'entries', 'hideCategory', 'subTitle')); + $entries = $cache->get(); + return view('accounts.show', compact('account', 'what', 'entries', 'subTitleIcon', 'journals', 'subTitle')); } diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index d06193e5ea..8dc927cb48 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -53,7 +53,7 @@ class AccountController extends Controller $cache->addProperty('expenseAccounts'); $cache->addProperty('accounts'); if ($cache->has()) { - // return Response::json($cache->get()); + return Response::json($cache->get()); } $accounts = $repository->getAccountsByType(['Expense account', 'Beneficiary account']); @@ -105,7 +105,7 @@ class AccountController extends Controller $cache->addProperty('frontpage'); $cache->addProperty('accounts'); if ($cache->has()) { - // return Response::json($cache->get()); + return Response::json($cache->get()); } $frontPage = Preferences::get('frontPageAccounts', $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray()); @@ -151,7 +151,7 @@ class AccountController extends Controller $cache->addProperty('default'); $cache->addProperty($accounts); if ($cache->has()) { - // return Response::json($cache->get()); + return Response::json($cache->get()); } foreach ($accounts as $account) { @@ -196,7 +196,7 @@ class AccountController extends Controller $cache->addProperty('single'); $cache->addProperty($account->id); if ($cache->has()) { - // return Response::json($cache->get()); + return Response::json($cache->get()); } $format = (string)trans('config.month_and_day'); diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index b763da7ac2..c2b9675ca5 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -308,7 +308,7 @@ class CategoryController extends Controller $cache->addProperty('specific-period'); if ($cache->has()) { - // return $cache->get(); + return $cache->get(); } $entries = new Collection; Log::debug('Start is ' . $start . ' en end is ' . $end); diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php index c6c24886dc..bbbf50eb58 100644 --- a/app/Http/Controllers/Chart/ReportController.php +++ b/app/Http/Controllers/Chart/ReportController.php @@ -100,7 +100,7 @@ class ReportController extends Controller $cache->addProperty($accounts); $cache->addProperty($end); if ($cache->has()) { - // return Response::json($cache->get()); + return Response::json($cache->get()); } // always per month.