robonen/education-project
1
0
Fork 0
mirror of https://github.com/robonen/education-project.git synced 2026-03-20 02:44:31 +00:00
Code Activity

исправил конфликты после обновления ветки

Browse Source
This commit is contained in:
ashen-1-dev
2020-12-16 20:57:35 +07:00
parent 3fe74339d2 1726a499d1
commit 74565e78e3
24 changed files with 427 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

245
composer.lock generated
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": "d29a824fe1ba5e1a371425931ce19f0b",
"content-hash": "94e022aa2f8a4e9c7f1f2b9740b6dbd5",
"packages": [
{
"name": "asm89/stack-cors",
@@ -58,6 +58,79 @@
],
"time": "2020-10-29T16:03:21+00:00"
},
{
"name": "barryvdh/laravel-cors",
"version": "v2.0.3",
"source": {
"type": "git",
"url": "https://github.com/fruitcake/laravel-cors.git",
"reference": "01de0fe5f71c70d1930ee9a80385f9cc28e0f63a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/01de0fe5f71c70d1930ee9a80385f9cc28e0f63a",
"reference": "01de0fe5f71c70d1930ee9a80385f9cc28e0f63a",
"shasum": ""
},
"require": {
"asm89/stack-cors": "^2.0.1",
"illuminate/contracts": "^6|^7|^8|^9",
"illuminate/support": "^6|^7|^8|^9",
"php": ">=7.2",
"symfony/http-foundation": "^4|^5",
"symfony/http-kernel": "^4.3.4|^5"
},
"require-dev": {
"laravel/framework": "^6|^7|^8",
"orchestra/testbench-dusk": "^4|^5|^6",
"phpunit/phpunit": "^6|^7|^8",
"squizlabs/php_codesniffer": "^3.5"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0-dev"
},
"laravel": {
"providers": [
"Fruitcake\\Cors\\CorsServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"Fruitcake\\Cors\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fruitcake",
"homepage": "https://fruitcake.nl"
},
{
"name": "Barry vd. Heuvel",
"email": "barryvdh@gmail.com"
}
],
"description": "Adds CORS (Cross-Origin Resource Sharing) headers support in your Laravel application",
"keywords": [
"api",
"cors",
"crossdomain",
"laravel"
],
"funding": [
{
"url": "https://github.com/barryvdh",
"type": "github"
}
],
"time": "2020-10-22T13:57:20+00:00"
},
{
"name": "brick/math",
"version": "0.9.1",
@@ -955,16 +1028,16 @@
},
{
"name": "laravel/framework",
"version": "v8.18.1",
"version": "v8.19.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "31747193c26ba0a9cb7929a912895d3cdefd10cf"
"reference": "f5f331cee60f1bbe672503b7eb9ba5b22b2ceacb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/31747193c26ba0a9cb7929a912895d3cdefd10cf",
"reference": "31747193c26ba0a9cb7929a912895d3cdefd10cf",
"url": "https://api.github.com/repos/laravel/framework/zipball/f5f331cee60f1bbe672503b7eb9ba5b22b2ceacb",
"reference": "f5f331cee60f1bbe672503b7eb9ba5b22b2ceacb",
"shasum": ""
},
"require": {
@@ -1114,20 +1187,20 @@
"framework",
"laravel"
],
"time": "2020-12-08T22:05:12+00:00"
"time": "2020-12-15T16:16:31+00:00"
},
{
"name": "laravel/passport",
"version": "v10.1.0",
"version": "v10.0.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/passport.git",
"reference": "c2b93a7d8d93cf303bb1eefbfa5610f084f9bdd4"
"reference": "4e53f1b237a9e51ac10f0b30c6ebedd68f6848ab"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/passport/zipball/c2b93a7d8d93cf303bb1eefbfa5610f084f9bdd4",
"reference": "c2b93a7d8d93cf303bb1eefbfa5610f084f9bdd4",
"url": "https://api.github.com/repos/laravel/passport/zipball/4e53f1b237a9e51ac10f0b30c6ebedd68f6848ab",
"reference": "4e53f1b237a9e51ac10f0b30c6ebedd68f6848ab",
"shasum": ""
},
"require": {
@@ -1142,10 +1215,9 @@
"illuminate/encryption": "^8.2",
"illuminate/http": "^8.2",
"illuminate/support": "^8.2",
"lcobucci/jwt": "^3.4|^4.0",
"league/oauth2-server": "^8.2",
"league/oauth2-server": "^8.1",
"nyholm/psr7": "^1.3",
"php": "^7.3|^8.0",
"php": "^7.3",
"phpseclib/phpseclib": "^2.0",
"symfony/psr-http-message-bridge": "^2.0"
},
@@ -1187,7 +1259,7 @@
"oauth",
"passport"
],
"time": "2020-11-26T07:57:30+00:00"
"time": "2020-09-15T16:41:42+00:00"
},
{
"name": "laravel/tinker",
@@ -1253,100 +1325,36 @@
],
"time": "2020-10-29T13:07:12+00:00"
},
{
"name": "lcobucci/clock",
"version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/lcobucci/clock.git",
"reference": "353d83fe2e6ae95745b16b3d911813df6a05bfb3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/lcobucci/clock/zipball/353d83fe2e6ae95745b16b3d911813df6a05bfb3",
"reference": "353d83fe2e6ae95745b16b3d911813df6a05bfb3",
"shasum": ""
},
"require": {
"php": "^7.4 || ^8.0"
},
"require-dev": {
"infection/infection": "^0.17",
"lcobucci/coding-standard": "^6.0",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-deprecation-rules": "^0.12",
"phpstan/phpstan-phpunit": "^0.12",
"phpstan/phpstan-strict-rules": "^0.12",
"phpunit/php-code-coverage": "9.1.4",
"phpunit/phpunit": "9.3.7"
},
"type": "library",
"autoload": {
"psr-4": {
"Lcobucci\\Clock\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Luís Cobucci",
"email": "lcobucci@gmail.com"
}
],
"description": "Yet another clock abstraction",
"funding": [
{
"url": "https://github.com/lcobucci",
"type": "github"
},
{
"url": "https://www.patreon.com/lcobucci",
"type": "patreon"
}
],
"time": "2020-08-27T18:56:02+00:00"
},
{
"name": "lcobucci/jwt",
"version": "4.0.0",
"version": "3.3.3",
"source": {
"type": "git",
"url": "https://github.com/lcobucci/jwt.git",
"reference": "6d8665ccd924dc076a9b65d1ea8abe21d68f6958"
"reference": "c1123697f6a2ec29162b82f170dd4a491f524773"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/lcobucci/jwt/zipball/6d8665ccd924dc076a9b65d1ea8abe21d68f6958",
"reference": "6d8665ccd924dc076a9b65d1ea8abe21d68f6958",
"url": "https://api.github.com/repos/lcobucci/jwt/zipball/c1123697f6a2ec29162b82f170dd4a491f524773",
"reference": "c1123697f6a2ec29162b82f170dd4a491f524773",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
"ext-openssl": "*",
"lcobucci/clock": "^2.0",
"php": "^7.4 || ^8.0"
"php": "^5.6 || ^7.0"
},
"require-dev": {
"infection/infection": "^0.20",
"lcobucci/coding-standard": "^6.0",
"mikey179/vfsstream": "^1.6",
"phpbench/phpbench": "^0.17",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-deprecation-rules": "^0.12",
"phpstan/phpstan-phpunit": "^0.12",
"phpstan/phpstan-strict-rules": "^0.12",
"phpunit/php-invoker": "^3.1",
"phpunit/phpunit": "^9.4"
"mikey179/vfsstream": "~1.5",
"phpmd/phpmd": "~2.2",
"phpunit/php-invoker": "~1.1",
"phpunit/phpunit": "^5.7 || ^7.3",
"squizlabs/php_codesniffer": "~2.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "3.1-dev"
}
},
"autoload": {
@@ -1360,7 +1368,7 @@
],
"authors": [
{
"name": "Luís Cobucci",
"name": "Luís Otávio Cobucci Oblonczyk",
"email": "lcobucci@gmail.com",
"role": "Developer"
}
@@ -1380,7 +1388,7 @@
"type": "patreon"
}
],
"time": "2020-11-25T02:06:12+00:00"
"time": "2020-08-20T13:22:28+00:00"
},
{
"name": "league/commonmark",
@@ -1671,25 +1679,25 @@
},
{
"name": "league/oauth2-server",
"version": "8.2.4",
"version": "8.1.1",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/oauth2-server.git",
"reference": "622eaa1f28eb4a2dea0cfc7e4f5280fac794e83c"
"reference": "09f22e8121fa1832962dba18213b80d4267ef8a3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/622eaa1f28eb4a2dea0cfc7e4f5280fac794e83c",
"reference": "622eaa1f28eb4a2dea0cfc7e4f5280fac794e83c",
"url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/09f22e8121fa1832962dba18213b80d4267ef8a3",
"reference": "09f22e8121fa1832962dba18213b80d4267ef8a3",
"shasum": ""
},
"require": {
"defuse/php-encryption": "^2.2.1",
"ext-json": "*",
"ext-openssl": "*",
"lcobucci/jwt": "^3.4 || ^4.0",
"lcobucci/jwt": "^3.3.1",
"league/event": "^2.2",
"php": "^7.2 || ^8.0",
"php": ">=7.2.0",
"psr/http-message": "^1.0.1"
},
"replace": {
@@ -1697,10 +1705,10 @@
"lncd/oauth2": "*"
},
"require-dev": {
"laminas/laminas-diactoros": "^2.4.1",
"phpstan/phpstan": "^0.12.57",
"phpstan/phpstan-phpunit": "^0.12.16",
"phpunit/phpunit": "^8.5.13",
"laminas/laminas-diactoros": "^2.3.0",
"phpstan/phpstan": "^0.11.19",
"phpstan/phpstan-phpunit": "^0.11.2",
"phpunit/phpunit": "^8.5.4 || ^9.1.3",
"roave/security-advisories": "dev-master"
},
"type": "library",
@@ -1750,20 +1758,20 @@
"type": "github"
}
],
"time": "2020-12-10T11:35:44+00:00"
"time": "2020-07-01T11:33:50+00:00"
},
{
"name": "monolog/monolog",
"version": "2.1.1",
"version": "2.2.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
"reference": "f9eee5cec93dfb313a38b6b288741e84e53f02d5"
"reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/f9eee5cec93dfb313a38b6b288741e84e53f02d5",
"reference": "f9eee5cec93dfb313a38b6b288741e84e53f02d5",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/1cb1cde8e8dd0f70cc0fe51354a59acad9302084",
"reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084",
"shasum": ""
},
"require": {
@@ -1776,16 +1784,17 @@
"require-dev": {
"aws/aws-sdk-php": "^2.4.9 || ^3.0",
"doctrine/couchdb": "~1.0@dev",
"elasticsearch/elasticsearch": "^6.0",
"elasticsearch/elasticsearch": "^7",
"graylog2/gelf-php": "^1.4.2",
"mongodb/mongodb": "^1.8",
"php-amqplib/php-amqplib": "~2.4",
"php-console/php-console": "^3.1.3",
"php-parallel-lint/php-parallel-lint": "^1.0",
"phpspec/prophecy": "^1.6.1",
"phpstan/phpstan": "^0.12.59",
"phpunit/phpunit": "^8.5",
"predis/predis": "^1.1",
"rollbar/rollbar": "^1.3",
"ruflin/elastica": ">=0.90 <3.0",
"ruflin/elastica": ">=0.90 <7.0.1",
"swiftmailer/swiftmailer": "^5.3|^6.0"
},
"suggest": {
@@ -1805,7 +1814,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
"dev-main": "2.x-dev"
}
},
"autoload": {
@@ -1821,11 +1830,11 @@
{
"name": "Jordi Boggiano",
"email": "j.boggiano@seld.be",
"homepage": "http://seld.be"
"homepage": "https://seld.be"
}
],
"description": "Sends your logs to files, sockets, inboxes, databases and various web services",
"homepage": "http://github.com/Seldaek/monolog",
"homepage": "https://github.com/Seldaek/monolog",
"keywords": [
"log",
"logging",
@@ -1841,7 +1850,7 @@
"type": "tidelift"
}
],
"time": "2020-07-23T08:41:23+00:00"
"time": "2020-12-14T13:15:25+00:00"
},
{
"name": "nesbot/carbon",
@@ -6141,16 +6150,16 @@
},
{
"name": "phar-io/version",
"version": "3.0.3",
"version": "3.0.4",
"source": {
"type": "git",
"url": "https://github.com/phar-io/version.git",
"reference": "726c026815142e4f8677b7cb7f2249c9ffb7ecae"
"reference": "e4782611070e50613683d2b9a57730e9a3ba5451"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phar-io/version/zipball/726c026815142e4f8677b7cb7f2249c9ffb7ecae",
"reference": "726c026815142e4f8677b7cb7f2249c9ffb7ecae",
"url": "https://api.github.com/repos/phar-io/version/zipball/e4782611070e50613683d2b9a57730e9a3ba5451",
"reference": "e4782611070e50613683d2b9a57730e9a3ba5451",
"shasum": ""
},
"require": {
@@ -6184,7 +6193,7 @@
}
],
"description": "Library for handling version information and constraints",
"time": "2020-11-30T09:21:21+00:00"
"time": "2020-12-13T23:18:30+00:00"
},
{
"name": "phpdocumentor/reflection-common",