Mirrors
/
movim
mirror of https://github.com/movim/movim
3
0
Fork 0
Code Releases Activity
Browse Source

Upgrade illuminate/database to 6.x

pull/898/head
Robin Gustafsson 6 years ago
parent
a6e94f5a05
commit
96bd2bde5f
9 changed files with 57 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      app/Contact.php
  2. 1
      app/EncryptedPassword.php
  3. 1
      app/Invite.php
  4. 1
      app/Session.php
  5. 1
      app/Url.php
  6. 1
      app/User.php
  7. 2
      composer.json
  8. 87
      composer.lock
  9. 7
      src/Movim/Model.php

1
app/Contact.php
View File

@ -11,6 +11,7 @@ use Movim\Picture;
class Contact extends Model
{
protected $fillable = ['id', 'nickname', 'mood'];
protected $keyType = 'string';
public $incrementing = false;
public function user()

1
app/EncryptedPassword.php
View File

@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model;
class EncryptedPassword extends Model
{
protected $fillable = ['id'];
protected $keyType = 'string';
public $incrementing = false;
public function session()

1
app/Invite.php
View File

@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model;
class Invite extends Model
{
public $primaryKey = 'code';
protected $keyType = 'string';
public $incrementing = false;
protected $fillable = ['code'];

1
app/Session.php
View File

@ -9,6 +9,7 @@ use Illuminate\Database\Capsule\Manager as DB;
class Session extends Model
{
protected $fillable = ['id'];
protected $keyType = 'string';
public $incrementing = false;
public function user()

1
app/Url.php
View File

@ -10,6 +10,7 @@ use Embed\Http\CurlDispatcher;
class Url extends Model
{
protected $primaryKey = 'hash';
protected $keyType = 'string';
public $incrementing = false;
public static function resolve($url)

1
app/User.php
View File

@ -11,6 +11,7 @@ class User extends Model
{
protected $fillable = ['id', 'language', 'nightmode', 'chatmain', 'nsfw', 'cssurl', 'nickname'];
public $with = ['session', 'capability'];
protected $keyType = 'string';
public $incrementing = false;
private static $me = null;
private $unreads = null;

2
composer.json
View File

@ -33,7 +33,7 @@
"defuse/php-encryption": "^2.2.1",
"robmorgan/phinx": "^0.11.1",
"illuminate/database": "^5.8",
"illuminate/database": "^6.0",
"doctrine/dbal": "^2.9.2",
"cboden/ratchet": "^0.4.1",

87
composer.lock
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "9296958a7f433005792cee88a49ef85b",
"content-hash": "7b4c2952e759ac42d5a524f7f314648c",
"packages": [
{
"name": "cakephp/cache",
@ -1233,28 +1233,27 @@
},
{
"name": "illuminate/container",
"version": "v5.8.36",
"version": "v6.8.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/container.git",
"reference": "b42e5ef939144b77f78130918da0ce2d9ee16574"
"reference": "ec885f4b9ae5be2341a4bf714c96ce2b10c886c5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/container/zipball/b42e5ef939144b77f78130918da0ce2d9ee16574",
"reference": "b42e5ef939144b77f78130918da0ce2d9ee16574",
"url": "https://api.github.com/repos/illuminate/container/zipball/ec885f4b9ae5be2341a4bf714c96ce2b10c886c5",
"reference": "ec885f4b9ae5be2341a4bf714c96ce2b10c886c5",
"shasum": ""
},
"require": {
"illuminate/contracts": "5.8.*",
"illuminate/support": "5.8.*",
"php": "^7.1.3",
"illuminate/contracts": "^6.0",
"php": "^7.2",
"psr/container": "^1.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.8-dev"
"dev-master": "6.0-dev"
}
},
"autoload": {
@ -1274,31 +1273,31 @@
],
"description": "The Illuminate Container package.",
"homepage": "https://laravel.com",
"time": "2019-08-20T02:00:23+00:00"
"time": "2019-12-17T14:28:56+00:00"
},
{
"name": "illuminate/contracts",
"version": "v5.8.36",
"version": "v6.8.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/contracts.git",
"reference": "00fc6afee788fa07c311b0650ad276585f8aef96"
"reference": "484727dc42f1c9dbffb2182f6fb0d01ca1aba556"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/00fc6afee788fa07c311b0650ad276585f8aef96",
"reference": "00fc6afee788fa07c311b0650ad276585f8aef96",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/484727dc42f1c9dbffb2182f6fb0d01ca1aba556",
"reference": "484727dc42f1c9dbffb2182f6fb0d01ca1aba556",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"php": "^7.2",
"psr/container": "^1.0",
"psr/simple-cache": "^1.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.8-dev"
"dev-master": "6.0-dev"
}
},
"autoload": {
@ -1318,41 +1317,41 @@
],
"description": "The Illuminate Contracts package.",
"homepage": "https://laravel.com",
"time": "2019-07-30T13:57:21+00:00"
"time": "2019-12-06T13:40:59+00:00"
},
{
"name": "illuminate/database",
"version": "v5.8.36",
"version": "v6.8.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/database.git",
"reference": "ac9ae2d82b8a6137400f17b3eea258be3518daa9"
"reference": "5c22160efab483e9b45fbf4a13a4dc99dc34c936"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/database/zipball/ac9ae2d82b8a6137400f17b3eea258be3518daa9",
"reference": "ac9ae2d82b8a6137400f17b3eea258be3518daa9",
"url": "https://api.github.com/repos/illuminate/database/zipball/5c22160efab483e9b45fbf4a13a4dc99dc34c936",
"reference": "5c22160efab483e9b45fbf4a13a4dc99dc34c936",
"shasum": ""
},
"require": {
"ext-json": "*",
"illuminate/container": "5.8.*",
"illuminate/contracts": "5.8.*",
"illuminate/support": "5.8.*",
"php": "^7.1.3"
"illuminate/container": "^6.0",
"illuminate/contracts": "^6.0",
"illuminate/support": "^6.0",
"php": "^7.2"
},
"suggest": {
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).",
"fzaninotto/faker": "Required to use the eloquent factory builder (^1.4).",
"illuminate/console": "Required to use the database commands (5.8.*).",
"illuminate/events": "Required to use the observers with Eloquent (5.8.*).",
"illuminate/filesystem": "Required to use the migrations (5.8.*).",
"illuminate/pagination": "Required to paginate the result set (5.8.*)."
"illuminate/console": "Required to use the database commands (^6.0).",
"illuminate/events": "Required to use the observers with Eloquent (^6.0).",
"illuminate/filesystem": "Required to use the migrations (^6.0).",
"illuminate/pagination": "Required to paginate the result set (^6.0)."
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.8-dev"
"dev-master": "6.0-dev"
}
},
"autoload": {
@ -1378,45 +1377,45 @@
"orm",
"sql"
],
"time": "2019-10-03T16:22:57+00:00"
"time": "2019-12-16T18:23:04+00:00"
},
{
"name": "illuminate/support",
"version": "v5.8.36",
"version": "v6.8.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/support.git",
"reference": "df4af6a32908f1d89d74348624b57e3233eea247"
"reference": "1536bbc476208a022805cb5b95ab72094d6d1b42"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/support/zipball/df4af6a32908f1d89d74348624b57e3233eea247",
"reference": "df4af6a32908f1d89d74348624b57e3233eea247",
"url": "https://api.github.com/repos/illuminate/support/zipball/1536bbc476208a022805cb5b95ab72094d6d1b42",
"reference": "1536bbc476208a022805cb5b95ab72094d6d1b42",
"shasum": ""
},
"require": {
"doctrine/inflector": "^1.1",
"ext-json": "*",
"ext-mbstring": "*",
"illuminate/contracts": "5.8.*",
"nesbot/carbon": "^1.26.3 || ^2.0",
"php": "^7.1.3"
"illuminate/contracts": "^6.0",
"nesbot/carbon": "^2.0",
"php": "^7.2"
},
"conflict": {
"tightenco/collect": "<5.5.33"
},
"suggest": {
"illuminate/filesystem": "Required to use the composer class (5.8.*).",
"illuminate/filesystem": "Required to use the composer class (^6.0).",
"moontoast/math": "Required to use ordered UUIDs (^1.1).",
"ramsey/uuid": "Required to use Str::uuid() (^3.7).",
"symfony/process": "Required to use the composer class (^4.2).",
"symfony/var-dumper": "Required to use the dd function (^4.2).",
"vlucas/phpdotenv": "Required to use the env helper (^3.3)."
"symfony/process": "Required to use the composer class (^4.3.4).",
"symfony/var-dumper": "Required to use the dd function (^4.3.4).",
"vlucas/phpdotenv": "Required to use the Env class and env helper (^3.3)."
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.8-dev"
"dev-master": "6.0-dev"
}
},
"autoload": {
@ -1439,7 +1438,7 @@
],
"description": "The Illuminate Support package.",
"homepage": "https://laravel.com",
"time": "2019-12-12T14:16:47+00:00"
"time": "2019-12-12T14:16:31+00:00"
},
{
"name": "michelf/php-markdown",

7
src/Movim/Model.php
View File

@ -8,6 +8,13 @@ use Illuminate\Database\Eloquent\Model as EloquentModel;
class Model extends EloquentModel
{
/**
* The "type" of the primary key ID.
*
* @var string
*/
protected $keyType = 'composite';
/**
* Get the value indicating whether the IDs are incrementing.
*

Write Preview
Loading…
Cancel
Save