From 968cab1074b6729e4f5ad12938bf5327311fefc3 Mon Sep 17 00:00:00 2001 From: Thibault Debatty <thibault.debatty@gmail.com> Date: Sun, 28 Jun 2020 17:10:12 +0200 Subject: [PATCH] update to laravel 6 --- composer.json | 5 +- composer.lock | 313 ++++++++++++------- resources/views/organization/index.blade.php | 6 +- resources/views/organization/show.blade.php | 10 +- resources/views/server/show.blade.php | 4 +- 5 files changed, 209 insertions(+), 129 deletions(-) diff --git a/composer.json b/composer.json index dfb814f..1afc2d0 100644 --- a/composer.json +++ b/composer.json @@ -9,10 +9,11 @@ "doctrine/dbal": "^2.9", "fideloper/proxy": "~4.0", "guzzlehttp/guzzle": "~6.0", - "laravel/framework": "5.8.*", + "laravel/framework": "^6.0", + "laravel/helpers": "^1.2", "laravel/tinker": "~1.0", "mongodb/mongodb": "1.3.*", - "tdebatty/laravel-resource-generator": "^0.0.3" + "tdebatty/laravel-resource-generator": "^6.1" }, "require-dev": { "barryvdh/laravel-ide-helper": "^2.5", diff --git a/composer.lock b/composer.lock index 4978d94..1797e1e 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "1e7915b00afa8fe83e409039541d53e1", + "content-hash": "541b82ecb9526a0c2d4f31b2def8f541", "packages": [ { "name": "composer/ca-bundle", @@ -594,16 +594,16 @@ }, { "name": "doctrine/inflector", - "version": "1.4.3", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "4650c8b30c753a76bf44fb2ed00117d6f367490c" + "reference": "9cf661f4eb38f7c881cac67c75ea9b00bf97b210" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/4650c8b30c753a76bf44fb2ed00117d6f367490c", - "reference": "4650c8b30c753a76bf44fb2ed00117d6f367490c", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/9cf661f4eb38f7c881cac67c75ea9b00bf97b210", + "reference": "9cf661f4eb38f7c881cac67c75ea9b00bf97b210", "shasum": "" }, "require": { @@ -624,7 +624,6 @@ }, "autoload": { "psr-4": { - "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector", "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" } }, @@ -668,7 +667,7 @@ "uppercase", "words" ], - "time": "2020-05-29T07:19:59+00:00" + "time": "2020-05-29T15:13:26+00:00" }, { "name": "doctrine/lexer", @@ -844,52 +843,6 @@ ], "time": "2020-06-16T20:11:17+00:00" }, - { - "name": "erusev/parsedown", - "version": "1.7.4", - "source": { - "type": "git", - "url": "https://github.com/erusev/parsedown.git", - "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3", - "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3", - "shasum": "" - }, - "require": { - "ext-mbstring": "*", - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35" - }, - "type": "library", - "autoload": { - "psr-0": { - "Parsedown": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Emanuil Rusev", - "email": "hello@erusev.com", - "homepage": "http://erusev.com" - } - ], - "description": "Parser for Markdown.", - "homepage": "http://parsedown.org", - "keywords": [ - "markdown", - "parser" - ], - "time": "2019-12-30T22:54:17+00:00" - }, { "name": "fideloper/proxy", "version": "4.4.0", @@ -1291,43 +1244,44 @@ }, { "name": "laravel/framework", - "version": "v5.8.38", + "version": "v6.18.22", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "78eb4dabcc03e189620c16f436358d41d31ae11f" + "reference": "95f33151375bb2e4747b871854c8becc23502901" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/78eb4dabcc03e189620c16f436358d41d31ae11f", - "reference": "78eb4dabcc03e189620c16f436358d41d31ae11f", + "url": "https://api.github.com/repos/laravel/framework/zipball/95f33151375bb2e4747b871854c8becc23502901", + "reference": "95f33151375bb2e4747b871854c8becc23502901", "shasum": "" }, "require": { - "doctrine/inflector": "^1.1", + "doctrine/inflector": "^1.4|^2.0", "dragonmantank/cron-expression": "^2.0", - "egulias/email-validator": "^2.0", - "erusev/parsedown": "^1.7", + "egulias/email-validator": "^2.1.10", "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", - "league/flysystem": "^1.0.8", - "monolog/monolog": "^1.12", - "nesbot/carbon": "^1.26.3 || ^2.0", + "league/commonmark": "^1.3", + "league/flysystem": "^1.0.34", + "monolog/monolog": "^1.12|^2.0", + "nesbot/carbon": "^2.0", "opis/closure": "^3.1", - "php": "^7.1.3", + "php": "^7.2", "psr/container": "^1.0", "psr/simple-cache": "^1.0", "ramsey/uuid": "^3.7", "swiftmailer/swiftmailer": "^6.0", - "symfony/console": "^4.2", - "symfony/debug": "^4.2", - "symfony/finder": "^4.2", - "symfony/http-foundation": "^4.2", - "symfony/http-kernel": "^4.2", - "symfony/process": "^4.2", - "symfony/routing": "^4.2", - "symfony/var-dumper": "^4.2", + "symfony/console": "^4.3.4", + "symfony/debug": "^4.3.4", + "symfony/finder": "^4.3.4", + "symfony/http-foundation": "^4.3.4", + "symfony/http-kernel": "^4.3.4", + "symfony/polyfill-php73": "^1.17", + "symfony/process": "^4.3.4", + "symfony/routing": "^4.3.4", + "symfony/var-dumper": "^4.3.4", "tijsverkoyen/css-to-inline-styles": "^2.2.1", "vlucas/phpdotenv": "^3.3" }, @@ -1367,47 +1321,46 @@ "require-dev": { "aws/aws-sdk-php": "^3.0", "doctrine/dbal": "^2.6", - "filp/whoops": "^2.1.4", - "guzzlehttp/guzzle": "^6.3", + "filp/whoops": "^2.4", + "guzzlehttp/guzzle": "^6.3|^7.0", "league/flysystem-cached-adapter": "^1.0", - "mockery/mockery": "^1.0", + "mockery/mockery": "^1.3.1", "moontoast/math": "^1.1", - "orchestra/testbench-core": "3.8.*", + "orchestra/testbench-core": "^4.0", "pda/pheanstalk": "^4.0", - "phpunit/phpunit": "^7.5|^8.0", + "phpunit/phpunit": "^7.5.15|^8.4|^9.0", "predis/predis": "^1.1.1", - "symfony/css-selector": "^4.2", - "symfony/dom-crawler": "^4.2", - "true/punycode": "^2.1" + "symfony/cache": "^4.3.4" }, "suggest": { - "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (^3.0).", + "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).", "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).", + "ext-ftp": "Required to use the Flysystem FTP driver.", "ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().", + "ext-memcached": "Required to use the memcache cache driver.", "ext-pcntl": "Required to use all features of the queue worker.", "ext-posix": "Required to use all features of the queue worker.", - "filp/whoops": "Required for friendly error pages in development (^2.1.4).", - "fzaninotto/faker": "Required to use the eloquent factory builder (^1.4).", - "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (^6.0).", - "laravel/tinker": "Required to use the tinker console command (^1.0).", + "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).", + "filp/whoops": "Required for friendly error pages in development (^2.4).", + "fzaninotto/faker": "Required to use the eloquent factory builder (^1.9.1).", + "guzzlehttp/guzzle": "Required to use the Mailgun mail driver and the ping methods on schedules (^6.0|^7.0).", + "laravel/tinker": "Required to use the tinker console command (^2.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).", "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).", - "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (^1.0).", "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).", "moontoast/math": "Required to use ordered UUIDs (^1.1).", - "nexmo/client": "Required to use the Nexmo transport (^1.0).", + "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).", "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).", - "predis/predis": "Required to use the redis cache and queue drivers (^1.0).", - "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^3.0).", - "symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.2).", - "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.2).", - "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.1).", + "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", + "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).", + "symfony/cache": "Required to PSR-6 cache bridge (^4.3.4).", + "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.2).", "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.8-dev" + "dev-master": "6.x-dev" } }, "autoload": { @@ -1435,7 +1388,60 @@ "framework", "laravel" ], - "time": "2020-04-14T14:14:36+00:00" + "time": "2020-06-24T13:08:51+00:00" + }, + { + "name": "laravel/helpers", + "version": "v1.2.0", + "source": { + "type": "git", + "url": "https://github.com/laravel/helpers.git", + "reference": "1f978fc5dad9f7f906b18242c654252615201de4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/helpers/zipball/1f978fc5dad9f7f906b18242c654252615201de4", + "reference": "1f978fc5dad9f7f906b18242c654252615201de4", + "shasum": "" + }, + "require": { + "illuminate/support": "~5.8.0|^6.0|^7.0", + "php": ">=7.1.3" + }, + "require-dev": { + "phpunit/phpunit": "^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "files": [ + "src/helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + }, + { + "name": "Dries Vints", + "email": "dries.vints@gmail.com" + } + ], + "description": "Provides backwards compatibility for helpers in the latest Laravel release.", + "keywords": [ + "helpers", + "laravel" + ], + "time": "2020-03-03T13:52:16+00:00" }, { "name": "laravel/tinker", @@ -1500,6 +1506,75 @@ ], "time": "2019-08-07T15:10:45+00:00" }, + { + "name": "league/commonmark", + "version": "1.5.1", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/commonmark.git", + "reference": "6d74caf6abeed5fd85d6ec20da23d7269cd0b46f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/6d74caf6abeed5fd85d6ec20da23d7269cd0b46f", + "reference": "6d74caf6abeed5fd85d6ec20da23d7269cd0b46f", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": "^7.1 || ^8.0" + }, + "conflict": { + "scrutinizer/ocular": "1.7.*" + }, + "require-dev": { + "cebe/markdown": "~1.0", + "commonmark/commonmark.js": "0.29.1", + "erusev/parsedown": "~1.0", + "ext-json": "*", + "github/gfm": "0.29.0", + "michelf/php-markdown": "~1.4", + "mikehaertl/php-shellcommand": "^1.4", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^7.5", + "scrutinizer/ocular": "^1.5", + "symfony/finder": "^4.2" + }, + "bin": [ + "bin/commonmark" + ], + "type": "library", + "autoload": { + "psr-4": { + "League\\CommonMark\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "https://www.colinodell.com", + "role": "Lead Developer" + } + ], + "description": "Highly-extensible PHP Markdown parser which fully supports the CommonMark spec and Github-Flavored Markdown (GFM)", + "homepage": "https://commonmark.thephpleague.com", + "keywords": [ + "commonmark", + "flavored", + "gfm", + "github", + "github-flavored", + "markdown", + "md", + "parser" + ], + "time": "2020-06-27T12:50:08+00:00" + }, { "name": "league/flysystem", "version": "1.0.69", @@ -1651,21 +1726,21 @@ }, { "name": "monolog/monolog", - "version": "1.25.4", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "3022efff205e2448b560c833c6fbbf91c3139168" + "reference": "38914429aac460e8e4616c8cb486ecb40ec90bb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/3022efff205e2448b560c833c6fbbf91c3139168", - "reference": "3022efff205e2448b560c833c6fbbf91c3139168", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/38914429aac460e8e4616c8cb486ecb40ec90bb1", + "reference": "38914429aac460e8e4616c8cb486ecb40ec90bb1", "shasum": "" }, "require": { - "php": ">=5.3.0", - "psr/log": "~1.0" + "php": ">=7.2", + "psr/log": "^1.0.1" }, "provide": { "psr/log-implementation": "1.0.0" @@ -1673,32 +1748,36 @@ "require-dev": { "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", - "graylog2/gelf-php": "~1.0", + "elasticsearch/elasticsearch": "^6.0", + "graylog2/gelf-php": "^1.4.2", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", "php-parallel-lint/php-parallel-lint": "^1.0", - "phpunit/phpunit": "~4.5", + "phpspec/prophecy": "^1.6.1", + "phpunit/phpunit": "^8.5", + "predis/predis": "^1.1", + "rollbar/rollbar": "^1.3", "ruflin/elastica": ">=0.90 <3.0", - "sentry/sentry": "^0.13", "swiftmailer/swiftmailer": "^5.3|^6.0" }, "suggest": { "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", - "ext-mongo": "Allow sending log messages to a MongoDB server", + "ext-mbstring": "Allow to work properly with unicode symbols", + "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", - "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", "php-console/php-console": "Allow sending log messages to Google Chrome", "rollbar/rollbar": "Allow sending log messages to Rollbar", - "ruflin/elastica": "Allow sending log messages to an Elastic Search server", - "sentry/sentry": "Allow sending log messages to a Sentry server" + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -1724,7 +1803,7 @@ "logging", "psr-3" ], - "time": "2020-05-22T07:31:27+00:00" + "time": "2020-05-22T08:12:19+00:00" }, { "name": "nesbot/carbon", @@ -4074,23 +4153,23 @@ }, { "name": "tdebatty/laravel-resource-generator", - "version": "0.0.3", + "version": "6.1.0", "source": { "type": "git", "url": "https://github.com/tdebatty/laravel-resource-generator.git", - "reference": "1da495c6d6f4d4d1c58d7198b3fee0d1266b1a61" + "reference": "2316180b0bd5bda67537025dd8e07173790af233" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tdebatty/laravel-resource-generator/zipball/1da495c6d6f4d4d1c58d7198b3fee0d1266b1a61", - "reference": "1da495c6d6f4d4d1c58d7198b3fee0d1266b1a61", + "url": "https://api.github.com/repos/tdebatty/laravel-resource-generator/zipball/2316180b0bd5bda67537025dd8e07173790af233", + "reference": "2316180b0bd5bda67537025dd8e07173790af233", "shasum": "" }, "require": { "composer/composer": "^1.6", - "illuminate/console": "^5.6", - "illuminate/filesystem": "^5.6", - "illuminate/support": "^5.6" + "illuminate/console": "^6.1 || ^7.0", + "illuminate/filesystem": "^6.1 || ^7.0", + "illuminate/support": "^6.1 || ^7.0" }, "require-dev": { "phpunit/phpunit": "^7.2", @@ -4120,7 +4199,7 @@ } ], "description": "Source code generator for laravel resources", - "time": "2018-07-17T13:31:08+00:00" + "time": "2020-04-22T11:40:16+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", diff --git a/resources/views/organization/index.blade.php b/resources/views/organization/index.blade.php index b913653..a988914 100644 --- a/resources/views/organization/index.blade.php +++ b/resources/views/organization/index.blade.php @@ -21,17 +21,17 @@ <td>{{ $organization->name }}</td> <td class="text-right"> <a class="btn btn-primary btn-sm" - href="{{ action('OrganizationController@show', ['Organization' => $organization]) }}"> + href="{{ action('OrganizationController@show', ['organization' => $organization]) }}"> Show </a> <a class="btn btn-primary btn-sm" - href="{{ action('OrganizationController@edit', ['Organization' => $organization]) }}"> + href="{{ action('OrganizationController@edit', ['organization' => $organization]) }}"> Edit </a> <form method="POST" - action="{{ action('OrganizationController@destroy', ['Organization' => $organization]) }}" + action="{{ action('OrganizationController@destroy', ['organization' => $organization]) }}" style="display: inline-block"> {{ csrf_field() }} {{ method_field("DELETE") }} diff --git a/resources/views/organization/show.blade.php b/resources/views/organization/show.blade.php index 2cea29b..1ba43c0 100644 --- a/resources/views/organization/show.blade.php +++ b/resources/views/organization/show.blade.php @@ -61,12 +61,12 @@ </div> <div class="card-body"> <a class="btn btn-primary" - href="{{ action('OrganizationController@edit', ['Organization' => $organization]) }}"> + href="{{ action('OrganizationController@edit', ['organization' => $organization]) }}"> Edit </a> <form method="POST" - action="{{ action('OrganizationController@destroy', ['Organization' => $organization]) }}" + action="{{ action('OrganizationController@destroy', ['organization' => $organization]) }}" style="display: inline-block"> {{ csrf_field() }} {{ method_field("DELETE") }} @@ -104,17 +104,17 @@ <td>{{ $server->info()->lsb() }}</td> <td class="text-right"> <a class="btn btn-primary btn-sm" - href="{{ action('ServerController@show', ['Server' => $server]) }}"> + href="{{ action('ServerController@show', ['server' => $server]) }}"> <i class="fa fa-search" aria-hidden="true"></i> Show </a> <a class="btn btn-primary btn-sm" - href="{{ action('ServerController@edit', ['Server' => $server]) }}"> + href="{{ action('ServerController@edit', ['server' => $server]) }}"> <i class="fas fa-pencil-alt"></i> Edit </a> <form method="POST" - action="{{ action('ServerController@destroy', ['Server' => $server]) }}" + action="{{ action('ServerController@destroy', ['server' => $server]) }}" style="display: inline-block"> {{ csrf_field() }} {{ method_field("DELETE") }} diff --git a/resources/views/server/show.blade.php b/resources/views/server/show.blade.php index dbb080c..1468ed6 100644 --- a/resources/views/server/show.blade.php +++ b/resources/views/server/show.blade.php @@ -62,12 +62,12 @@ window.monitorServerToken = "{{ $server->read_token }}"; <div> <a class="btn btn-primary btn-sm" - href="{{ action('ServerController@edit', ['Server' => $server]) }}"> + href="{{ action('ServerController@edit', ['server' => $server]) }}"> <i class="fa fa-pencil" aria-hidden="true"></i> Edit </a> <form method="POST" - action="{{ action('ServerController@destroy', ['Server' => $server]) }}" + action="{{ action('ServerController@destroy', ['server' => $server]) }}" style="display: inline-block"> {{ csrf_field() }} {{ method_field("DELETE") }} -- GitLab