kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 10:33:30 +00:00
Code Issues Projects Releases Wiki Activity

Update composer, fix migrations

Browse Source
This commit is contained in:
James Cole
2019-09-13 05:36:01 +02:00
parent 8fd5b45a72
commit 4fd23694c7
2 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
composer.lock generated
View File

@@ -2805,16 +2805,16 @@
}, },
{ {
"name": "pragmarx/google2fa-laravel", "name": "pragmarx/google2fa-laravel",
"version": "v1.1.0", "version": "v1.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/antonioribeiro/google2fa-laravel.git", "url": "https://github.com/antonioribeiro/google2fa-laravel.git",
"reference": "5f19f869775e038e982f972b2fc9901337140a77" "reference": "3b14f1fa2753c7f9bb5abb6504601662d836d104"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/antonioribeiro/google2fa-laravel/zipball/5f19f869775e038e982f972b2fc9901337140a77", "url": "https://api.github.com/repos/antonioribeiro/google2fa-laravel/zipball/3b14f1fa2753c7f9bb5abb6504601662d836d104",
"reference": "5f19f869775e038e982f972b2fc9901337140a77", "reference": "3b14f1fa2753c7f9bb5abb6504601662d836d104",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2872,7 +2872,7 @@
"google2fa", "google2fa",
"laravel" "laravel"
], ],
"time": "2019-09-10T20:34:37+00:00" "time": "2019-09-13T02:06:13+00:00"
}, },
{ {
"name": "pragmarx/google2fa-qrcode", "name": "pragmarx/google2fa-qrcode",
@@ -6300,35 +6300,33 @@
}, },
{ {
"name": "phpdocumentor/reflection-common", "name": "phpdocumentor/reflection-common",
"version": "1.0.1", "version": "2.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/ReflectionCommon.git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
"reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a",
"reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.5" "php": ">=7.1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.6" "phpunit/phpunit": "~6"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0.x-dev" "dev-master": "2.x-dev"
} }
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"phpDocumentor\\Reflection\\": [ "phpDocumentor\\Reflection\\": "src/"
"src"
]
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@@ -6350,30 +6348,30 @@
"reflection", "reflection",
"static analysis" "static analysis"
], ],
"time": "2017-09-11T18:02:19+00:00" "time": "2018-08-07T13:53:10+00:00"
}, },
{ {
"name": "phpdocumentor/reflection-docblock", "name": "phpdocumentor/reflection-docblock",
"version": "4.3.1", "version": "4.3.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c" "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c", "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
"reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c", "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.0", "php": "^7.0",
"phpdocumentor/reflection-common": "^1.0.0", "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0",
"phpdocumentor/type-resolver": "^0.4.0", "phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
"webmozart/assert": "^1.0" "webmozart/assert": "^1.0"
}, },
"require-dev": { "require-dev": {
"doctrine/instantiator": "~1.0.5", "doctrine/instantiator": "^1.0.5",
"mockery/mockery": "^1.0", "mockery/mockery": "^1.0",
"phpunit/phpunit": "^6.4" "phpunit/phpunit": "^6.4"
}, },
@@ -6401,41 +6399,40 @@
} }
], ],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2019-04-30T17:48:53+00:00" "time": "2019-09-12T14:27:41+00:00"
}, },
{ {
"name": "phpdocumentor/type-resolver", "name": "phpdocumentor/type-resolver",
"version": "0.4.0", "version": "1.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git", "url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
"reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.5 || ^7.0", "php": "^7.1",
"phpdocumentor/reflection-common": "^1.0" "phpdocumentor/reflection-common": "^2.0"
}, },
"require-dev": { "require-dev": {
"mockery/mockery": "^0.9.4", "ext-tokenizer": "^7.1",
"phpunit/phpunit": "^5.2||^4.8.24" "mockery/mockery": "~1",
"phpunit/phpunit": "^7.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0.x-dev" "dev-master": "1.x-dev"
} }
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"phpDocumentor\\Reflection\\": [ "phpDocumentor\\Reflection\\": "src"
"src/"
]
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@@ -6448,7 +6445,8 @@
"email": "me@mikevanriel.com" "email": "me@mikevanriel.com"
} }
], ],
"time": "2017-07-14T14:27:02+00:00" "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"time": "2019-08-22T18:11:29+00:00"
}, },
{ {
"name": "phpspec/prophecy", "name": "phpspec/prophecy",

8
database/migrations/2016_08_25_091522_changes_for_3101.php
View File

@@ -36,7 +36,9 @@ class ChangesFor3101 extends Migration
Schema::table( Schema::table(
'import_jobs', 'import_jobs',
static function (Blueprint $table) { static function (Blueprint $table) {
$table->dropColumn('extended_status'); if (Schema::hasColumn('import_jobs', 'extended_status')) {
$table->dropColumn('extended_status');
}
} }
); );
} }
@@ -51,7 +53,9 @@ class ChangesFor3101 extends Migration
Schema::table( Schema::table(
'import_jobs', 'import_jobs',
static function (Blueprint $table) { static function (Blueprint $table) {
$table->text('extended_status')->nullable(); if (!Schema::hasColumn('import_jobs', 'extended_status')) {
$table->text('extended_status')->nullable();
}
} }
); );
} }