Commit abc1b901e995bfa28ec820c8a7112609d4bd14bc
1 parent
e66e075e19
Коммит баг с миграциями
Showing 8 changed files with 84 additions and 299 deletions Side-by-side Diff
- composer.json
- composer.lock
- database/migrations/2024_06_24_092718_alert_table_users.php
- database/migrations/2024_06_27_124222_alert_sertifications_table.php
- database/migrations/2024_08_09_072423_alter_table_chats.php
- database/migrations/2024_08_10_123217_alter_table_workers.php
- database/migrations/2024_09_18_104034_change_ip_to_id_in_likes_tables.php
- webstat/index.html
composer.json
composer.lock
... | ... | @@ -4,7 +4,7 @@ |
4 | 4 | "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", |
5 | 5 | "This file is @generated automatically" |
6 | 6 | ], |
7 | - "content-hash": "a7eb5dd83a46d4d36bcfd6dc5e419b75", | |
7 | + "content-hash": "3ec5ac1b1672ef52de708476e39931cf", | |
8 | 8 | "packages": [ |
9 | 9 | { |
10 | 10 | "name": "akaunting/laravel-money", |
... | ... | @@ -358,79 +358,6 @@ |
358 | 358 | "time": "2023-01-15T23:15:59+00:00" |
359 | 359 | }, |
360 | 360 | { |
361 | - "name": "composer/package-versions-deprecated", | |
362 | - "version": "1.11.99.5", | |
363 | - "source": { | |
364 | - "type": "git", | |
365 | - "url": "https://github.com/composer/package-versions-deprecated.git", | |
366 | - "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d" | |
367 | - }, | |
368 | - "dist": { | |
369 | - "type": "zip", | |
370 | - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b4f54f74ef3453349c24a845d22392cd31e65f1d", | |
371 | - "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d", | |
372 | - "shasum": "" | |
373 | - }, | |
374 | - "require": { | |
375 | - "composer-plugin-api": "^1.1.0 || ^2.0", | |
376 | - "php": "^7 || ^8" | |
377 | - }, | |
378 | - "replace": { | |
379 | - "ocramius/package-versions": "1.11.99" | |
380 | - }, | |
381 | - "require-dev": { | |
382 | - "composer/composer": "^1.9.3 || ^2.0@dev", | |
383 | - "ext-zip": "^1.13", | |
384 | - "phpunit/phpunit": "^6.5 || ^7" | |
385 | - }, | |
386 | - "type": "composer-plugin", | |
387 | - "extra": { | |
388 | - "class": "PackageVersions\\Installer", | |
389 | - "branch-alias": { | |
390 | - "dev-master": "1.x-dev" | |
391 | - } | |
392 | - }, | |
393 | - "autoload": { | |
394 | - "psr-4": { | |
395 | - "PackageVersions\\": "src/PackageVersions" | |
396 | - } | |
397 | - }, | |
398 | - "notification-url": "https://packagist.org/downloads/", | |
399 | - "license": [ | |
400 | - "MIT" | |
401 | - ], | |
402 | - "authors": [ | |
403 | - { | |
404 | - "name": "Marco Pivetta", | |
405 | - "email": "ocramius@gmail.com" | |
406 | - }, | |
407 | - { | |
408 | - "name": "Jordi Boggiano", | |
409 | - "email": "j.boggiano@seld.be" | |
410 | - } | |
411 | - ], | |
412 | - "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", | |
413 | - "support": { | |
414 | - "issues": "https://github.com/composer/package-versions-deprecated/issues", | |
415 | - "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.5" | |
416 | - }, | |
417 | - "funding": [ | |
418 | - { | |
419 | - "url": "https://packagist.com", | |
420 | - "type": "custom" | |
421 | - }, | |
422 | - { | |
423 | - "url": "https://github.com/composer", | |
424 | - "type": "github" | |
425 | - }, | |
426 | - { | |
427 | - "url": "https://tidelift.com/funding/github/packagist/composer/composer", | |
428 | - "type": "tidelift" | |
429 | - } | |
430 | - ], | |
431 | - "time": "2022-01-17T14:14:24+00:00" | |
432 | - }, | |
433 | - { | |
434 | 361 | "name": "danharrin/date-format-converter", |
435 | 362 | "version": "v0.3.0", |
436 | 363 | "source": { |
... | ... | @@ -557,146 +484,44 @@ |
557 | 484 | "time": "2022-10-27T11:44:00+00:00" |
558 | 485 | }, |
559 | 486 | { |
560 | - "name": "doctrine/cache", | |
561 | - "version": "1.13.0", | |
562 | - "source": { | |
563 | - "type": "git", | |
564 | - "url": "https://github.com/doctrine/cache.git", | |
565 | - "reference": "56cd022adb5514472cb144c087393c1821911d09" | |
566 | - }, | |
567 | - "dist": { | |
568 | - "type": "zip", | |
569 | - "url": "https://api.github.com/repos/doctrine/cache/zipball/56cd022adb5514472cb144c087393c1821911d09", | |
570 | - "reference": "56cd022adb5514472cb144c087393c1821911d09", | |
571 | - "shasum": "" | |
572 | - }, | |
573 | - "require": { | |
574 | - "php": "~7.1 || ^8.0" | |
575 | - }, | |
576 | - "conflict": { | |
577 | - "doctrine/common": ">2.2,<2.4" | |
578 | - }, | |
579 | - "require-dev": { | |
580 | - "alcaeus/mongo-php-adapter": "^1.1", | |
581 | - "cache/integration-tests": "dev-master", | |
582 | - "doctrine/coding-standard": "^9", | |
583 | - "mongodb/mongodb": "^1.1", | |
584 | - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", | |
585 | - "predis/predis": "~1.0", | |
586 | - "psr/cache": "^1.0 || ^2.0 || ^3.0", | |
587 | - "symfony/cache": "^4.4 || ^5.4 || ^6", | |
588 | - "symfony/var-exporter": "^4.4 || ^5.4 || ^6" | |
589 | - }, | |
590 | - "suggest": { | |
591 | - "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" | |
592 | - }, | |
593 | - "type": "library", | |
594 | - "autoload": { | |
595 | - "psr-4": { | |
596 | - "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" | |
597 | - } | |
598 | - }, | |
599 | - "notification-url": "https://packagist.org/downloads/", | |
600 | - "license": [ | |
601 | - "MIT" | |
602 | - ], | |
603 | - "authors": [ | |
604 | - { | |
605 | - "name": "Guilherme Blanco", | |
606 | - "email": "guilhermeblanco@gmail.com" | |
607 | - }, | |
608 | - { | |
609 | - "name": "Roman Borschel", | |
610 | - "email": "roman@code-factory.org" | |
611 | - }, | |
612 | - { | |
613 | - "name": "Benjamin Eberlei", | |
614 | - "email": "kontakt@beberlei.de" | |
615 | - }, | |
616 | - { | |
617 | - "name": "Jonathan Wage", | |
618 | - "email": "jonwage@gmail.com" | |
619 | - }, | |
620 | - { | |
621 | - "name": "Johannes Schmitt", | |
622 | - "email": "schmittjoh@gmail.com" | |
623 | - } | |
624 | - ], | |
625 | - "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.", | |
626 | - "homepage": "https://www.doctrine-project.org/projects/cache.html", | |
627 | - "keywords": [ | |
628 | - "abstraction", | |
629 | - "apcu", | |
630 | - "cache", | |
631 | - "caching", | |
632 | - "couchdb", | |
633 | - "memcached", | |
634 | - "php", | |
635 | - "redis", | |
636 | - "xcache" | |
637 | - ], | |
638 | - "support": { | |
639 | - "issues": "https://github.com/doctrine/cache/issues", | |
640 | - "source": "https://github.com/doctrine/cache/tree/1.13.0" | |
641 | - }, | |
642 | - "funding": [ | |
643 | - { | |
644 | - "url": "https://www.doctrine-project.org/sponsorship.html", | |
645 | - "type": "custom" | |
646 | - }, | |
647 | - { | |
648 | - "url": "https://www.patreon.com/phpdoctrine", | |
649 | - "type": "patreon" | |
650 | - }, | |
651 | - { | |
652 | - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache", | |
653 | - "type": "tidelift" | |
654 | - } | |
655 | - ], | |
656 | - "time": "2022-05-20T20:06:54+00:00" | |
657 | - }, | |
658 | - { | |
659 | 487 | "name": "doctrine/dbal", |
660 | - "version": "3.0.0", | |
488 | + "version": "4.1.1", | |
661 | 489 | "source": { |
662 | 490 | "type": "git", |
663 | 491 | "url": "https://github.com/doctrine/dbal.git", |
664 | - "reference": "ee6d1260d5cc20ec506455a585945d7bdb98662c" | |
492 | + "reference": "7a8252418689feb860ea8dfeab66d64a56a64df8" | |
665 | 493 | }, |
666 | 494 | "dist": { |
667 | 495 | "type": "zip", |
668 | - "url": "https://api.github.com/repos/doctrine/dbal/zipball/ee6d1260d5cc20ec506455a585945d7bdb98662c", | |
669 | - "reference": "ee6d1260d5cc20ec506455a585945d7bdb98662c", | |
496 | + "url": "https://api.github.com/repos/doctrine/dbal/zipball/7a8252418689feb860ea8dfeab66d64a56a64df8", | |
497 | + "reference": "7a8252418689feb860ea8dfeab66d64a56a64df8", | |
670 | 498 | "shasum": "" |
671 | 499 | }, |
672 | 500 | "require": { |
673 | - "composer/package-versions-deprecated": "^1.11.99", | |
674 | - "doctrine/cache": "^1.0", | |
675 | - "doctrine/event-manager": "^1.0", | |
676 | - "php": "^7.3 || ^8.0" | |
501 | + "doctrine/deprecations": "^0.5.3|^1", | |
502 | + "php": "^8.1", | |
503 | + "psr/cache": "^1|^2|^3", | |
504 | + "psr/log": "^1|^2|^3" | |
677 | 505 | }, |
678 | 506 | "require-dev": { |
679 | - "doctrine/coding-standard": "^8.1", | |
680 | - "jetbrains/phpstorm-stubs": "^2019.1", | |
681 | - "phpstan/phpstan": "^0.12.40", | |
682 | - "phpstan/phpstan-strict-rules": "^0.12.2", | |
683 | - "phpunit/phpunit": "^9.4", | |
684 | - "psalm/plugin-phpunit": "^0.10.0", | |
685 | - "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", | |
686 | - "vimeo/psalm": "^3.17.2" | |
507 | + "doctrine/coding-standard": "12.0.0", | |
508 | + "fig/log-test": "^1", | |
509 | + "jetbrains/phpstorm-stubs": "2023.2", | |
510 | + "phpstan/phpstan": "1.12.0", | |
511 | + "phpstan/phpstan-phpunit": "1.4.0", | |
512 | + "phpstan/phpstan-strict-rules": "^1.6", | |
513 | + "phpunit/phpunit": "10.5.30", | |
514 | + "psalm/plugin-phpunit": "0.19.0", | |
515 | + "slevomat/coding-standard": "8.13.1", | |
516 | + "squizlabs/php_codesniffer": "3.10.2", | |
517 | + "symfony/cache": "^6.3.8|^7.0", | |
518 | + "symfony/console": "^5.4|^6.3|^7.0", | |
519 | + "vimeo/psalm": "5.25.0" | |
687 | 520 | }, |
688 | 521 | "suggest": { |
689 | 522 | "symfony/console": "For helpful console commands such as SQL execution and import of files." |
690 | 523 | }, |
691 | - "bin": [ | |
692 | - "bin/doctrine-dbal" | |
693 | - ], | |
694 | 524 | "type": "library", |
695 | - "extra": { | |
696 | - "branch-alias": { | |
697 | - "dev-master": "4.0.x-dev" | |
698 | - } | |
699 | - }, | |
700 | 525 | "autoload": { |
701 | 526 | "psr-4": { |
702 | 527 | "Doctrine\\DBAL\\": "src" |
... | ... | @@ -748,7 +573,7 @@ |
748 | 573 | ], |
749 | 574 | "support": { |
750 | 575 | "issues": "https://github.com/doctrine/dbal/issues", |
751 | - "source": "https://github.com/doctrine/dbal/tree/3.0.0" | |
576 | + "source": "https://github.com/doctrine/dbal/tree/4.1.1" | |
752 | 577 | }, |
753 | 578 | "funding": [ |
754 | 579 | { |
... | ... | @@ -764,7 +589,7 @@ |
764 | 589 | "type": "tidelift" |
765 | 590 | } |
766 | 591 | ], |
767 | - "time": "2020-11-15T18:20:41+00:00" | |
592 | + "time": "2024-09-03T08:58:39+00:00" | |
768 | 593 | }, |
769 | 594 | { |
770 | 595 | "name": "doctrine/deprecations", |
... | ... | @@ -810,98 +635,6 @@ |
810 | 635 | "time": "2022-05-02T15:47:09+00:00" |
811 | 636 | }, |
812 | 637 | { |
813 | - "name": "doctrine/event-manager", | |
814 | - "version": "1.2.0", | |
815 | - "source": { | |
816 | - "type": "git", | |
817 | - "url": "https://github.com/doctrine/event-manager.git", | |
818 | - "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520" | |
819 | - }, | |
820 | - "dist": { | |
821 | - "type": "zip", | |
822 | - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/95aa4cb529f1e96576f3fda9f5705ada4056a520", | |
823 | - "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520", | |
824 | - "shasum": "" | |
825 | - }, | |
826 | - "require": { | |
827 | - "doctrine/deprecations": "^0.5.3 || ^1", | |
828 | - "php": "^7.1 || ^8.0" | |
829 | - }, | |
830 | - "conflict": { | |
831 | - "doctrine/common": "<2.9" | |
832 | - }, | |
833 | - "require-dev": { | |
834 | - "doctrine/coding-standard": "^9 || ^10", | |
835 | - "phpstan/phpstan": "~1.4.10 || ^1.8.8", | |
836 | - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", | |
837 | - "vimeo/psalm": "^4.24" | |
838 | - }, | |
839 | - "type": "library", | |
840 | - "autoload": { | |
841 | - "psr-4": { | |
842 | - "Doctrine\\Common\\": "src" | |
843 | - } | |
844 | - }, | |
845 | - "notification-url": "https://packagist.org/downloads/", | |
846 | - "license": [ | |
847 | - "MIT" | |
848 | - ], | |
849 | - "authors": [ | |
850 | - { | |
851 | - "name": "Guilherme Blanco", | |
852 | - "email": "guilhermeblanco@gmail.com" | |
853 | - }, | |
854 | - { | |
855 | - "name": "Roman Borschel", | |
856 | - "email": "roman@code-factory.org" | |
857 | - }, | |
858 | - { | |
859 | - "name": "Benjamin Eberlei", | |
860 | - "email": "kontakt@beberlei.de" | |
861 | - }, | |
862 | - { | |
863 | - "name": "Jonathan Wage", | |
864 | - "email": "jonwage@gmail.com" | |
865 | - }, | |
866 | - { | |
867 | - "name": "Johannes Schmitt", | |
868 | - "email": "schmittjoh@gmail.com" | |
869 | - }, | |
870 | - { | |
871 | - "name": "Marco Pivetta", | |
872 | - "email": "ocramius@gmail.com" | |
873 | - } | |
874 | - ], | |
875 | - "description": "The Doctrine Event Manager is a simple PHP event system that was built to be used with the various Doctrine projects.", | |
876 | - "homepage": "https://www.doctrine-project.org/projects/event-manager.html", | |
877 | - "keywords": [ | |
878 | - "event", | |
879 | - "event dispatcher", | |
880 | - "event manager", | |
881 | - "event system", | |
882 | - "events" | |
883 | - ], | |
884 | - "support": { | |
885 | - "issues": "https://github.com/doctrine/event-manager/issues", | |
886 | - "source": "https://github.com/doctrine/event-manager/tree/1.2.0" | |
887 | - }, | |
888 | - "funding": [ | |
889 | - { | |
890 | - "url": "https://www.doctrine-project.org/sponsorship.html", | |
891 | - "type": "custom" | |
892 | - }, | |
893 | - { | |
894 | - "url": "https://www.patreon.com/phpdoctrine", | |
895 | - "type": "patreon" | |
896 | - }, | |
897 | - { | |
898 | - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fevent-manager", | |
899 | - "type": "tidelift" | |
900 | - } | |
901 | - ], | |
902 | - "time": "2022-10-12T20:51:15+00:00" | |
903 | - }, | |
904 | - { | |
905 | 638 | "name": "doctrine/inflector", |
906 | 639 | "version": "2.0.6", |
907 | 640 | "source": { |
... | ... | @@ -4307,6 +4040,55 @@ |
4307 | 4040 | "time": "2023-02-25T19:38:58+00:00" |
4308 | 4041 | }, |
4309 | 4042 | { |
4043 | + "name": "psr/cache", | |
4044 | + "version": "3.0.0", | |
4045 | + "source": { | |
4046 | + "type": "git", | |
4047 | + "url": "https://github.com/php-fig/cache.git", | |
4048 | + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf" | |
4049 | + }, | |
4050 | + "dist": { | |
4051 | + "type": "zip", | |
4052 | + "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", | |
4053 | + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", | |
4054 | + "shasum": "" | |
4055 | + }, | |
4056 | + "require": { | |
4057 | + "php": ">=8.0.0" | |
4058 | + }, | |
4059 | + "type": "library", | |
4060 | + "extra": { | |
4061 | + "branch-alias": { | |
4062 | + "dev-master": "1.0.x-dev" | |
4063 | + } | |
4064 | + }, | |
4065 | + "autoload": { | |
4066 | + "psr-4": { | |
4067 | + "Psr\\Cache\\": "src/" | |
4068 | + } | |
4069 | + }, | |
4070 | + "notification-url": "https://packagist.org/downloads/", | |
4071 | + "license": [ | |
4072 | + "MIT" | |
4073 | + ], | |
4074 | + "authors": [ | |
4075 | + { | |
4076 | + "name": "PHP-FIG", | |
4077 | + "homepage": "https://www.php-fig.org/" | |
4078 | + } | |
4079 | + ], | |
4080 | + "description": "Common interface for caching libraries", | |
4081 | + "keywords": [ | |
4082 | + "cache", | |
4083 | + "psr", | |
4084 | + "psr-6" | |
4085 | + ], | |
4086 | + "support": { | |
4087 | + "source": "https://github.com/php-fig/cache/tree/3.0.0" | |
4088 | + }, | |
4089 | + "time": "2021-02-03T23:26:27+00:00" | |
4090 | + }, | |
4091 | + { | |
4310 | 4092 | "name": "psr/container", |
4311 | 4093 | "version": "2.0.2", |
4312 | 4094 | "source": { |
... | ... | @@ -10426,5 +10208,5 @@ |
10426 | 10208 | "php": "^8.0.2" |
10427 | 10209 | }, |
10428 | 10210 | "platform-dev": [], |
10429 | - "plugin-api-version": "2.6.0" | |
10211 | + "plugin-api-version": "2.3.0" | |
10430 | 10212 | } |
database/migrations/2024_06_24_092718_alert_table_users.php
... | ... | @@ -13,12 +13,13 @@ return new class extends Migration |
13 | 13 | */ |
14 | 14 | public function up() |
15 | 15 | { |
16 | - Schema::table('users', function (Blueprint $table) { | |
16 | + /* Schema::table('users', function (Blueprint $table) { | |
17 | 17 | $table->smallInteger('is_lookin')->tinyInteger('is_lookin')->default(0)->change(); |
18 | 18 | $table->smallInteger('is_message')->tinyInteger('is_message')->default(0)->change(); |
19 | 19 | $table->smallInteger('is_public')->tinyInteger('is_public')->default(0)->change(); |
20 | 20 | $table->smallInteger('is_manager')->tinyInteger('is_manager')->default(0)->change(); |
21 | 21 | }); |
22 | + */ | |
22 | 23 | } |
23 | 24 | |
24 | 25 | /** |
database/migrations/2024_06_27_124222_alert_sertifications_table.php
... | ... | @@ -14,7 +14,7 @@ return new class extends Migration |
14 | 14 | public function up() |
15 | 15 | { |
16 | 16 | Schema::table('sertifications', function (Blueprint $table) { |
17 | - $table->string('education', 255)->nullable()->change(); | |
17 | + //$table->string('education', 255)->nullable()->change(); | |
18 | 18 | }); |
19 | 19 | } |
20 | 20 |
database/migrations/2024_08_09_072423_alter_table_chats.php
... | ... | @@ -14,8 +14,8 @@ return new class extends Migration |
14 | 14 | public function up() |
15 | 15 | { |
16 | 16 | Schema::table('chats', function (Blueprint $table) { |
17 | - $table->dateTime('last_message_date')->nullable(true)->change(); | |
18 | - $table->integer('last_message_id')->nullable(true)->change(); | |
17 | + $table->dateTime('last_message_date')->nullable(true); //->change(); | |
18 | + $table->integer('last_message_id')->nullable(true); //->change(); | |
19 | 19 | $table->boolean('is_admin_chat')->default(false)->after('is_fixed'); |
20 | 20 | }); |
21 | 21 | } |
database/migrations/2024_08_10_123217_alter_table_workers.php
... | ... | @@ -14,8 +14,9 @@ return new class extends Migration |
14 | 14 | public function up() |
15 | 15 | { |
16 | 16 | Schema::table('workers', function (Blueprint $table) { |
17 | + $table->integer('position_work')->nullable(true);//->change(); | |
17 | 18 | $table->string('positions_work', 255)->nullable(true)->after('position_work'); |
18 | - $table->integer('position_work')->nullable(true)->change(); | |
19 | + | |
19 | 20 | |
20 | 21 | }); |
21 | 22 | } |
database/migrations/2024_09_18_104034_change_ip_to_id_in_likes_tables.php
... | ... | @@ -13,12 +13,13 @@ return new class extends Migration |
13 | 13 | */ |
14 | 14 | public function up() |
15 | 15 | { |
16 | - Schema::table('like_worker', function (Blueprint $table) { | |
16 | + /* Schema::table('like_worker', function (Blueprint $table) { | |
17 | 17 | $table->renameColumn('ip_address', 'user_id'); |
18 | 18 | }); |
19 | 19 | Schema::table('like_vacancy', function (Blueprint $table) { |
20 | 20 | $table->renameColumn('ip_address', 'user_id'); |
21 | 21 | }); |
22 | + */ | |
22 | 23 | } |
23 | 24 | |
24 | 25 | /** |
webstat/index.html