diff --git a/app/Models/Ipv4Mac.php b/app/Models/Ipv4Mac.php index 875ba37b3a..11c04640d4 100644 --- a/app/Models/Ipv4Mac.php +++ b/app/Models/Ipv4Mac.php @@ -6,8 +6,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; class Ipv4Mac extends PortRelatedModel { - use \Awobaz\Compoships\Compoships; - protected $table = 'ipv4_mac'; public $timestamps = false; diff --git a/app/Models/PortsFdb.php b/app/Models/PortsFdb.php index 15da25b1f9..81e8902456 100644 --- a/app/Models/PortsFdb.php +++ b/app/Models/PortsFdb.php @@ -7,8 +7,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany; class PortsFdb extends PortRelatedModel { - use \Awobaz\Compoships\Compoships; - protected $table = 'ports_fdb'; protected $primaryKey = 'ports_fdb_id'; public $timestamps = true; @@ -27,6 +25,6 @@ class PortsFdb extends PortRelatedModel public function ipv4Addresses(): HasMany { - return $this->hasMany(\App\Models\Ipv4Mac::class, ['mac_address', 'device_id'], ['mac_address', 'device_id']); + return $this->hasMany(\App\Models\Ipv4Mac::class, 'mac_address', 'mac_address'); } } diff --git a/composer.json b/composer.json index 1c9c88d346..13571c07c3 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,6 @@ "ext-xml": "*", "ext-zlib": "*", "amenadiel/jpgraph": "^4", - "awobaz/compoships": "^2.2", "clue/socket-raw": "^1.4", "dapphp/radius": "^3.0", "doctrine/dbal": "^3.5", diff --git a/composer.lock b/composer.lock index 2a8b82033c..1410737b40 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": "e0a7adc00795e33e5aea56de6b165f8a", + "content-hash": "21dbcfec63eafb1ae9172473314a57f8", "packages": [ { "name": "amenadiel/jpgraph", @@ -78,68 +78,6 @@ }, "time": "2021-04-27T19:09:11+00:00" }, - { - "name": "awobaz/compoships", - "version": "2.2.3", - "source": { - "type": "git", - "url": "https://github.com/topclaudy/compoships.git", - "reference": "404901e2ebd6794f70d2710a56edd4b0c500ce1f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/topclaudy/compoships/zipball/404901e2ebd6794f70d2710a56edd4b0c500ce1f", - "reference": "404901e2ebd6794f70d2710a56edd4b0c500ce1f", - "shasum": "" - }, - "require": { - "fakerphp/faker": "^1.18", - "illuminate/database": ">=5.6 <11.0" - }, - "require-dev": { - "ext-sqlite3": "*", - "phpunit/phpunit": "^6.0|^8.0|^9.0" - }, - "suggest": { - "awobaz/blade-active": "Blade directives for the Laravel 'Active' package", - "awobaz/eloquent-auto-append": "Automatically append accessors to model serialization", - "awobaz/eloquent-mutators": "Reusable mutators (getters/setters) for Laravel 5's Eloquent", - "awobaz/syntactic": "Syntactic sugar for named and indexed parameters call." - }, - "type": "library", - "autoload": { - "psr-4": { - "Awobaz\\Compoships\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Claudin J. Daniel", - "email": "cdaniel@awobaz.com" - } - ], - "description": "Laravel relationships with support for composite/multiple keys", - "keywords": [ - "laravel", - "laravel composite keys", - "laravel relationships" - ], - "support": { - "issues": "https://github.com/topclaudy/compoships/issues", - "source": "https://github.com/topclaudy/compoships/tree/2.2.3" - }, - "funding": [ - { - "url": "https://paypal.me/awobaz", - "type": "custom" - } - ], - "time": "2023-02-22T16:52:55+00:00" - }, { "name": "brick/math", "version": "0.11.0", @@ -1227,69 +1165,6 @@ }, "time": "2023-11-17T15:01:25+00:00" }, - { - "name": "fakerphp/faker", - "version": "v1.23.1", - "source": { - "type": "git", - "url": "https://github.com/FakerPHP/Faker.git", - "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/bfb4fe148adbf78eff521199619b93a52ae3554b", - "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b", - "shasum": "" - }, - "require": { - "php": "^7.4 || ^8.0", - "psr/container": "^1.0 || ^2.0", - "symfony/deprecation-contracts": "^2.2 || ^3.0" - }, - "conflict": { - "fzaninotto/faker": "*" - }, - "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", - "doctrine/persistence": "^1.3 || ^2.0", - "ext-intl": "*", - "phpunit/phpunit": "^9.5.26", - "symfony/phpunit-bridge": "^5.4.16" - }, - "suggest": { - "doctrine/orm": "Required to use Faker\\ORM\\Doctrine", - "ext-curl": "Required by Faker\\Provider\\Image to download images.", - "ext-dom": "Required by Faker\\Provider\\HtmlLorem for generating random HTML.", - "ext-iconv": "Required by Faker\\Provider\\ru_RU\\Text::realText() for generating real Russian text.", - "ext-mbstring": "Required for multibyte Unicode string functionality." - }, - "type": "library", - "autoload": { - "psr-4": { - "Faker\\": "src/Faker/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "François Zaninotto" - } - ], - "description": "Faker is a PHP library that generates fake data for you.", - "keywords": [ - "data", - "faker", - "fixtures" - ], - "support": { - "issues": "https://github.com/FakerPHP/Faker/issues", - "source": "https://github.com/FakerPHP/Faker/tree/v1.23.1" - }, - "time": "2024-01-02T13:46:09+00:00" - }, { "name": "fico7489/laravel-pivot", "version": "3.0.11", @@ -10143,6 +10018,69 @@ ], "time": "2022-12-30T00:23:10+00:00" }, + { + "name": "fakerphp/faker", + "version": "v1.23.1", + "source": { + "type": "git", + "url": "https://github.com/FakerPHP/Faker.git", + "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/bfb4fe148adbf78eff521199619b93a52ae3554b", + "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0", + "psr/container": "^1.0 || ^2.0", + "symfony/deprecation-contracts": "^2.2 || ^3.0" + }, + "conflict": { + "fzaninotto/faker": "*" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.4.1", + "doctrine/persistence": "^1.3 || ^2.0", + "ext-intl": "*", + "phpunit/phpunit": "^9.5.26", + "symfony/phpunit-bridge": "^5.4.16" + }, + "suggest": { + "doctrine/orm": "Required to use Faker\\ORM\\Doctrine", + "ext-curl": "Required by Faker\\Provider\\Image to download images.", + "ext-dom": "Required by Faker\\Provider\\HtmlLorem for generating random HTML.", + "ext-iconv": "Required by Faker\\Provider\\ru_RU\\Text::realText() for generating real Russian text.", + "ext-mbstring": "Required for multibyte Unicode string functionality." + }, + "type": "library", + "autoload": { + "psr-4": { + "Faker\\": "src/Faker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "François Zaninotto" + } + ], + "description": "Faker is a PHP library that generates fake data for you.", + "keywords": [ + "data", + "faker", + "fixtures" + ], + "support": { + "issues": "https://github.com/FakerPHP/Faker/issues", + "source": "https://github.com/FakerPHP/Faker/tree/v1.23.1" + }, + "time": "2024-01-02T13:46:09+00:00" + }, { "name": "filp/whoops", "version": "2.15.4",