From abc1b901e995bfa28ec820c8a7112609d4bd14bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=20=D0=9B=D0=B0=D1=80?= =?UTF-8?q?=D0=B8=D0=BE=D0=BD=D0=BE=D0=B2?= Date: Mon, 23 Sep 2024 14:51:48 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=20=D0=B1=D0=B0?= =?UTF-8?q?=D0=B3=20=D1=81=20=D0=BC=D0=B8=D0=B3=D1=80=D0=B0=D1=86=D0=B8=D1=8F?= =?UTF-8?q?=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 2 +- composer.lock | 366 ++++---------------- .../2024_06_24_092718_alert_table_users.php | 3 +- ...024_06_27_124222_alert_sertifications_table.php | 2 +- .../2024_08_09_072423_alter_table_chats.php | 4 +- .../2024_08_10_123217_alter_table_workers.php | 3 +- ...9_18_104034_change_ip_to_id_in_likes_tables.php | 3 +- 7 files changed, 84 insertions(+), 299 deletions(-) create mode 100644 webstat/index.html diff --git a/composer.json b/composer.json index 83ad51a..f64224e 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "require": { "php": "^8.0.2", "barryvdh/laravel-dompdf": "^2.1", - "doctrine/dbal": "3.0", + "doctrine/dbal": "^4.1", "filament/forms": "^2.17", "filament/notifications": "^2.17", "filament/tables": "^2.17", diff --git a/composer.lock b/composer.lock index 2ce008f..3057372 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": "a7eb5dd83a46d4d36bcfd6dc5e419b75", + "content-hash": "3ec5ac1b1672ef52de708476e39931cf", "packages": [ { "name": "akaunting/laravel-money", @@ -358,79 +358,6 @@ "time": "2023-01-15T23:15:59+00:00" }, { - "name": "composer/package-versions-deprecated", - "version": "1.11.99.5", - "source": { - "type": "git", - "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b4f54f74ef3453349c24a845d22392cd31e65f1d", - "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.1.0 || ^2.0", - "php": "^7 || ^8" - }, - "replace": { - "ocramius/package-versions": "1.11.99" - }, - "require-dev": { - "composer/composer": "^1.9.3 || ^2.0@dev", - "ext-zip": "^1.13", - "phpunit/phpunit": "^6.5 || ^7" - }, - "type": "composer-plugin", - "extra": { - "class": "PackageVersions\\Installer", - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "PackageVersions\\": "src/PackageVersions" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be" - } - ], - "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", - "support": { - "issues": "https://github.com/composer/package-versions-deprecated/issues", - "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.5" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2022-01-17T14:14:24+00:00" - }, - { "name": "danharrin/date-format-converter", "version": "v0.3.0", "source": { @@ -557,146 +484,44 @@ "time": "2022-10-27T11:44:00+00:00" }, { - "name": "doctrine/cache", - "version": "1.13.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/cache.git", - "reference": "56cd022adb5514472cb144c087393c1821911d09" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/56cd022adb5514472cb144c087393c1821911d09", - "reference": "56cd022adb5514472cb144c087393c1821911d09", - "shasum": "" - }, - "require": { - "php": "~7.1 || ^8.0" - }, - "conflict": { - "doctrine/common": ">2.2,<2.4" - }, - "require-dev": { - "alcaeus/mongo-php-adapter": "^1.1", - "cache/integration-tests": "dev-master", - "doctrine/coding-standard": "^9", - "mongodb/mongodb": "^1.1", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "predis/predis": "~1.0", - "psr/cache": "^1.0 || ^2.0 || ^3.0", - "symfony/cache": "^4.4 || ^5.4 || ^6", - "symfony/var-exporter": "^4.4 || ^5.4 || ^6" - }, - "suggest": { - "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.", - "homepage": "https://www.doctrine-project.org/projects/cache.html", - "keywords": [ - "abstraction", - "apcu", - "cache", - "caching", - "couchdb", - "memcached", - "php", - "redis", - "xcache" - ], - "support": { - "issues": "https://github.com/doctrine/cache/issues", - "source": "https://github.com/doctrine/cache/tree/1.13.0" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache", - "type": "tidelift" - } - ], - "time": "2022-05-20T20:06:54+00:00" - }, - { "name": "doctrine/dbal", - "version": "3.0.0", + "version": "4.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "ee6d1260d5cc20ec506455a585945d7bdb98662c" + "reference": "7a8252418689feb860ea8dfeab66d64a56a64df8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/ee6d1260d5cc20ec506455a585945d7bdb98662c", - "reference": "ee6d1260d5cc20ec506455a585945d7bdb98662c", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/7a8252418689feb860ea8dfeab66d64a56a64df8", + "reference": "7a8252418689feb860ea8dfeab66d64a56a64df8", "shasum": "" }, "require": { - "composer/package-versions-deprecated": "^1.11.99", - "doctrine/cache": "^1.0", - "doctrine/event-manager": "^1.0", - "php": "^7.3 || ^8.0" + "doctrine/deprecations": "^0.5.3|^1", + "php": "^8.1", + "psr/cache": "^1|^2|^3", + "psr/log": "^1|^2|^3" }, "require-dev": { - "doctrine/coding-standard": "^8.1", - "jetbrains/phpstorm-stubs": "^2019.1", - "phpstan/phpstan": "^0.12.40", - "phpstan/phpstan-strict-rules": "^0.12.2", - "phpunit/phpunit": "^9.4", - "psalm/plugin-phpunit": "^0.10.0", - "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", - "vimeo/psalm": "^3.17.2" + "doctrine/coding-standard": "12.0.0", + "fig/log-test": "^1", + "jetbrains/phpstorm-stubs": "2023.2", + "phpstan/phpstan": "1.12.0", + "phpstan/phpstan-phpunit": "1.4.0", + "phpstan/phpstan-strict-rules": "^1.6", + "phpunit/phpunit": "10.5.30", + "psalm/plugin-phpunit": "0.19.0", + "slevomat/coding-standard": "8.13.1", + "squizlabs/php_codesniffer": "3.10.2", + "symfony/cache": "^6.3.8|^7.0", + "symfony/console": "^5.4|^6.3|^7.0", + "vimeo/psalm": "5.25.0" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." }, - "bin": [ - "bin/doctrine-dbal" - ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\DBAL\\": "src" @@ -748,7 +573,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.0.0" + "source": "https://github.com/doctrine/dbal/tree/4.1.1" }, "funding": [ { @@ -764,7 +589,7 @@ "type": "tidelift" } ], - "time": "2020-11-15T18:20:41+00:00" + "time": "2024-09-03T08:58:39+00:00" }, { "name": "doctrine/deprecations", @@ -810,98 +635,6 @@ "time": "2022-05-02T15:47:09+00:00" }, { - "name": "doctrine/event-manager", - "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/event-manager.git", - "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/95aa4cb529f1e96576f3fda9f5705ada4056a520", - "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520", - "shasum": "" - }, - "require": { - "doctrine/deprecations": "^0.5.3 || ^1", - "php": "^7.1 || ^8.0" - }, - "conflict": { - "doctrine/common": "<2.9" - }, - "require-dev": { - "doctrine/coding-standard": "^9 || ^10", - "phpstan/phpstan": "~1.4.10 || ^1.8.8", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.24" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Common\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - }, - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" - } - ], - "description": "The Doctrine Event Manager is a simple PHP event system that was built to be used with the various Doctrine projects.", - "homepage": "https://www.doctrine-project.org/projects/event-manager.html", - "keywords": [ - "event", - "event dispatcher", - "event manager", - "event system", - "events" - ], - "support": { - "issues": "https://github.com/doctrine/event-manager/issues", - "source": "https://github.com/doctrine/event-manager/tree/1.2.0" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fevent-manager", - "type": "tidelift" - } - ], - "time": "2022-10-12T20:51:15+00:00" - }, - { "name": "doctrine/inflector", "version": "2.0.6", "source": { @@ -4307,6 +4040,55 @@ "time": "2023-02-25T19:38:58+00:00" }, { + "name": "psr/cache", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/cache.git", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "shasum": "" + }, + "require": { + "php": ">=8.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Cache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for caching libraries", + "keywords": [ + "cache", + "psr", + "psr-6" + ], + "support": { + "source": "https://github.com/php-fig/cache/tree/3.0.0" + }, + "time": "2021-02-03T23:26:27+00:00" + }, + { "name": "psr/container", "version": "2.0.2", "source": { @@ -10426,5 +10208,5 @@ "php": "^8.0.2" }, "platform-dev": [], - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } diff --git a/database/migrations/2024_06_24_092718_alert_table_users.php b/database/migrations/2024_06_24_092718_alert_table_users.php index d0a896d..f6d7104 100644 --- a/database/migrations/2024_06_24_092718_alert_table_users.php +++ b/database/migrations/2024_06_24_092718_alert_table_users.php @@ -13,12 +13,13 @@ return new class extends Migration */ public function up() { - Schema::table('users', function (Blueprint $table) { + /* Schema::table('users', function (Blueprint $table) { $table->smallInteger('is_lookin')->tinyInteger('is_lookin')->default(0)->change(); $table->smallInteger('is_message')->tinyInteger('is_message')->default(0)->change(); $table->smallInteger('is_public')->tinyInteger('is_public')->default(0)->change(); $table->smallInteger('is_manager')->tinyInteger('is_manager')->default(0)->change(); }); + */ } /** diff --git a/database/migrations/2024_06_27_124222_alert_sertifications_table.php b/database/migrations/2024_06_27_124222_alert_sertifications_table.php index 5d8af7f..32bccc5 100644 --- a/database/migrations/2024_06_27_124222_alert_sertifications_table.php +++ b/database/migrations/2024_06_27_124222_alert_sertifications_table.php @@ -14,7 +14,7 @@ return new class extends Migration public function up() { Schema::table('sertifications', function (Blueprint $table) { - $table->string('education', 255)->nullable()->change(); + //$table->string('education', 255)->nullable()->change(); }); } diff --git a/database/migrations/2024_08_09_072423_alter_table_chats.php b/database/migrations/2024_08_09_072423_alter_table_chats.php index e90e1a2..0b1e06e 100644 --- a/database/migrations/2024_08_09_072423_alter_table_chats.php +++ b/database/migrations/2024_08_09_072423_alter_table_chats.php @@ -14,8 +14,8 @@ return new class extends Migration public function up() { Schema::table('chats', function (Blueprint $table) { - $table->dateTime('last_message_date')->nullable(true)->change(); - $table->integer('last_message_id')->nullable(true)->change(); + $table->dateTime('last_message_date')->nullable(true); //->change(); + $table->integer('last_message_id')->nullable(true); //->change(); $table->boolean('is_admin_chat')->default(false)->after('is_fixed'); }); } diff --git a/database/migrations/2024_08_10_123217_alter_table_workers.php b/database/migrations/2024_08_10_123217_alter_table_workers.php index 7ccb59a..8ae412f 100644 --- a/database/migrations/2024_08_10_123217_alter_table_workers.php +++ b/database/migrations/2024_08_10_123217_alter_table_workers.php @@ -14,8 +14,9 @@ return new class extends Migration public function up() { Schema::table('workers', function (Blueprint $table) { + $table->integer('position_work')->nullable(true);//->change(); $table->string('positions_work', 255)->nullable(true)->after('position_work'); - $table->integer('position_work')->nullable(true)->change(); + }); } diff --git a/database/migrations/2024_09_18_104034_change_ip_to_id_in_likes_tables.php b/database/migrations/2024_09_18_104034_change_ip_to_id_in_likes_tables.php index e42ff2a..4600d76 100644 --- a/database/migrations/2024_09_18_104034_change_ip_to_id_in_likes_tables.php +++ b/database/migrations/2024_09_18_104034_change_ip_to_id_in_likes_tables.php @@ -13,12 +13,13 @@ return new class extends Migration */ public function up() { - Schema::table('like_worker', function (Blueprint $table) { + /* Schema::table('like_worker', function (Blueprint $table) { $table->renameColumn('ip_address', 'user_id'); }); Schema::table('like_vacancy', function (Blueprint $table) { $table->renameColumn('ip_address', 'user_id'); }); + */ } /** diff --git a/webstat/index.html b/webstat/index.html new file mode 100644 index 0000000..e69de29 -- 1.7.10.4