Merge branch 'develop' into v480

* develop: (21 commits)
  Update lock file
  Update change logs and config files.
  Enable norsk, update version of DB
  Various language string updates.
  Norwegian strings.
  Improve installer middleware for Sandstorm.
  Fix some issues with importer #2166
  Other delete thing.
  More debug things.
  Extra debug info for #2159 and some kernel changes.
  Extra debug info for #2159
  Fix #2173
  Rename class and add copyright statement @wrouesnel #2167
  Fix LDAP auth configuration paths.
  Fix some cache issues and a version bump.
  Updated file list.
  Updated list.
  New file list.
  Update composer file.
  Small fix in changelog.
  ...
This commit is contained in:
James Cole
2019-03-17 12:34:36 +01:00
67 changed files with 4405 additions and 908 deletions

View File

@@ -0,0 +1,64 @@
<?php
/**
* 2019_03_11_223700_fix_ldap_configuration.php
* Copyright (c) 2019 https://github.com/wrouesnel
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
/**
* Class FixLdapConfiguration
*/
class FixLdapConfiguration extends Migration
{
/**
* Reverse the migrations.
*
* @return void
*/
public function down(): void
{
Schema::table(
'users', function (Blueprint $table) {
$table->dropColumn(['objectguid']);
}
);
}
/**
* Run the migrations.
*
* @return void
*/
public function up(): void
{
/**
* ADLdap2 appears to require the ability to store an objectguid for LDAP users
* now. To support this, we add the column.
*/
Schema::table(
'users', function (Blueprint $table) {
$table->uuid('objectguid')->nullable()->after('id');
}
);
}
}

View File

@@ -32,7 +32,7 @@ class ConfigSeeder extends Seeder
/**
* Run the database seeds.
*/
public function run()
public function run(): void
{
$entry = Configuration::where('name', 'db_version')->first();
if (null === $entry) {