diff --git a/app/Behaviors/ImportsData.php b/app/Behaviors/ImportsData.php index 2f5ebd2a..bfb8aeef 100644 --- a/app/Behaviors/ImportsData.php +++ b/app/Behaviors/ImportsData.php @@ -3,7 +3,6 @@ namespace App\Behaviors; use Illuminate\Support\Facades\DB; - use Carbon\Carbon; use Sentry\State\Scope; diff --git a/app/Console/Commands/Bulk/BulkImport.php b/app/Console/Commands/Bulk/BulkImport.php index 950f1dce..6ec38b67 100644 --- a/app/Console/Commands/Bulk/BulkImport.php +++ b/app/Console/Commands/Bulk/BulkImport.php @@ -3,7 +3,6 @@ namespace App\Console\Commands\Bulk; use Illuminate\Support\Facades\DB; - use Aic\Hub\Foundation\AbstractCommand as BaseCommand; class BulkImport extends BaseCommand diff --git a/app/Console/Commands/Dump/AbstractDumpCommand.php b/app/Console/Commands/Dump/AbstractDumpCommand.php index 1331cfbd..f9db7ed3 100644 --- a/app/Console/Commands/Dump/AbstractDumpCommand.php +++ b/app/Console/Commands/Dump/AbstractDumpCommand.php @@ -5,7 +5,6 @@ use Illuminate\Support\Facades\Storage; use App\Library\Shell; use Exception; - use App\Console\Commands\BaseCommand; abstract class AbstractDumpCommand extends BaseCommand diff --git a/app/Console/Commands/Dump/DumpExportGettingStarted.php b/app/Console/Commands/Dump/DumpExportGettingStarted.php index 1968448f..dd958c1e 100644 --- a/app/Console/Commands/Dump/DumpExportGettingStarted.php +++ b/app/Console/Commands/Dump/DumpExportGettingStarted.php @@ -3,7 +3,6 @@ namespace App\Console\Commands\Dump; use Illuminate\Support\Facades\Storage; - use League\Csv\Writer; class DumpExportGettingStarted extends AbstractDumpCommand diff --git a/app/Console/Commands/Import/AbstractImportCommand.php b/app/Console/Commands/Import/AbstractImportCommand.php index 7aaf07db..72b76c00 100644 --- a/app/Console/Commands/Import/AbstractImportCommand.php +++ b/app/Console/Commands/Import/AbstractImportCommand.php @@ -5,11 +5,8 @@ use Carbon\Carbon; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; - use Aic\Hub\Foundation\AbstractCommand as BaseCommand; - use App\Behaviors\ImportsData; - use Illuminate\Support\Str; abstract class AbstractImportCommand extends BaseCommand diff --git a/app/Console/Commands/Import/ImportMobile.php b/app/Console/Commands/Import/ImportMobile.php index f14b5b72..ef7749cc 100644 --- a/app/Console/Commands/Import/ImportMobile.php +++ b/app/Console/Commands/Import/ImportMobile.php @@ -3,12 +3,10 @@ namespace App\Console\Commands\Import; use Illuminate\Support\Facades\Storage; - use App\Models\Mobile\Artwork as MobileArtwork; use App\Models\Mobile\Sound; use App\Models\Mobile\Tour; use App\Models\Mobile\TourStop; - use App\Transformers\Traits\ConvertsToHtml; class ImportMobile extends AbstractImportCommand diff --git a/app/Console/Commands/Import/ImportSites.php b/app/Console/Commands/Import/ImportSites.php index ded0ca68..b7494329 100644 --- a/app/Console/Commands/Import/ImportSites.php +++ b/app/Console/Commands/Import/ImportSites.php @@ -3,7 +3,6 @@ namespace App\Console\Commands\Import; use Illuminate\Support\Facades\Storage; - use App\Models\StaticArchive\Site; use App\Transformers\Inbound\StaticArchive\Site as SiteTransformer; diff --git a/app/Console/Commands/Migrations/AbstractCommand.php b/app/Console/Commands/Migrations/AbstractCommand.php index dde8a232..1993d436 100644 --- a/app/Console/Commands/Migrations/AbstractCommand.php +++ b/app/Console/Commands/Migrations/AbstractCommand.php @@ -7,7 +7,6 @@ use Illuminate\Database\Schema\Blueprint; use App\Library\Migrations\MigrationCreator; use ColinODell\Indentation\Indentation; - use Aic\Hub\Foundation\AbstractCommand as BaseCommand; abstract class AbstractCommand extends BaseCommand diff --git a/app/Console/Commands/Report/ReportMigrations.php b/app/Console/Commands/Report/ReportMigrations.php index c0dfa7d9..7f8efefe 100644 --- a/app/Console/Commands/Report/ReportMigrations.php +++ b/app/Console/Commands/Report/ReportMigrations.php @@ -3,7 +3,6 @@ namespace App\Console\Commands\Report; use App\Library\Shell; - use Aic\Hub\Foundation\AbstractCommand as BaseCommand; class ReportMigrations extends BaseCommand diff --git a/app/Console/Commands/Search/ScoutImportAll.php b/app/Console/Commands/Search/ScoutImportAll.php index 9f39c6cb..559ac0a1 100644 --- a/app/Console/Commands/Search/ScoutImportAll.php +++ b/app/Console/Commands/Search/ScoutImportAll.php @@ -3,7 +3,6 @@ namespace App\Console\Commands\Search; use Illuminate\Support\Facades\Config; - use Aic\Hub\Foundation\AbstractCommand as BaseCommand; class ScoutImportAll extends BaseCommand diff --git a/app/Console/Commands/Search/ScoutImportCsv.php b/app/Console/Commands/Search/ScoutImportCsv.php index 4bdd18a3..23313b81 100644 --- a/app/Console/Commands/Search/ScoutImportCsv.php +++ b/app/Console/Commands/Search/ScoutImportCsv.php @@ -4,7 +4,6 @@ use League\Csv\Reader; use Illuminate\Support\Facades\Storage; - use Aic\Hub\Foundation\AbstractCommand as BaseCommand; class ScoutImportCsv extends BaseCommand diff --git a/app/Console/Commands/Search/ScoutImportSince.php b/app/Console/Commands/Search/ScoutImportSince.php index 49bea638..1cb80f3e 100644 --- a/app/Console/Commands/Search/ScoutImportSince.php +++ b/app/Console/Commands/Search/ScoutImportSince.php @@ -4,7 +4,6 @@ use Carbon\Carbon; use Illuminate\Support\Facades\Schema; - use Aic\Hub\Foundation\AbstractCommand as BaseCommand; class ScoutImportSince extends BaseCommand diff --git a/app/Console/Commands/Search/ScoutSince.php b/app/Console/Commands/Search/ScoutSince.php index 5ac25700..cb9c57c4 100644 --- a/app/Console/Commands/Search/ScoutSince.php +++ b/app/Console/Commands/Search/ScoutSince.php @@ -3,7 +3,6 @@ namespace App\Console\Commands\Search; use Carbon\Carbon; - use Aic\Hub\Foundation\AbstractCommand as BaseCommand; class ScoutSince extends BaseCommand diff --git a/app/Console/Commands/Search/SearchAudit.php b/app/Console/Commands/Search/SearchAudit.php index 6c6136dd..bd5e4e1a 100644 --- a/app/Console/Commands/Search/SearchAudit.php +++ b/app/Console/Commands/Search/SearchAudit.php @@ -4,7 +4,6 @@ use Carbon\Carbon; use Elasticsearch; - use Aic\Hub\Foundation\AbstractCommand as BaseCommand; class SearchAudit extends BaseCommand diff --git a/app/Console/Commands/Search/SearchInstall.php b/app/Console/Commands/Search/SearchInstall.php index 2c007514..7b7c79ee 100644 --- a/app/Console/Commands/Search/SearchInstall.php +++ b/app/Console/Commands/Search/SearchInstall.php @@ -3,9 +3,7 @@ namespace App\Console\Commands\Search; use Elasticsearch; - use App\Console\Helpers\Indexer; - use Aic\Hub\Foundation\AbstractCommand as BaseCommand; class SearchInstall extends BaseCommand diff --git a/app/Console/Commands/Search/SearchReindex.php b/app/Console/Commands/Search/SearchReindex.php index 44d94964..cf38522d 100644 --- a/app/Console/Commands/Search/SearchReindex.php +++ b/app/Console/Commands/Search/SearchReindex.php @@ -3,9 +3,7 @@ namespace App\Console\Commands\Search; use Elasticsearch; - use App\Console\Helpers\Indexer; - use Aic\Hub\Foundation\AbstractCommand as BaseCommand; class SearchReindex extends BaseCommand diff --git a/app/Console/Commands/Search/SearchUninstall.php b/app/Console/Commands/Search/SearchUninstall.php index 275e1d63..c5d9b953 100644 --- a/app/Console/Commands/Search/SearchUninstall.php +++ b/app/Console/Commands/Search/SearchUninstall.php @@ -3,9 +3,7 @@ namespace App\Console\Commands\Search; use Elasticsearch; - use App\Console\Helpers\Indexer; - use Aic\Hub\Foundation\AbstractCommand as BaseCommand; class SearchUninstall extends BaseCommand @@ -22,7 +20,8 @@ public function handle() { $prefix = $this->argument('index') ?? config('elasticsearch.indexParams.index'); - if (!$this->option('yes') && + if ( + !$this->option('yes') && !$this->confirm('This will delete all indexes with `' . $prefix . '` prefix. Are you sure?') ) { return false; diff --git a/app/Console/Commands/Update/UpdateNetx.php b/app/Console/Commands/Update/UpdateNetx.php index fada2ef1..03f671df 100644 --- a/app/Console/Commands/Update/UpdateNetx.php +++ b/app/Console/Commands/Update/UpdateNetx.php @@ -3,7 +3,6 @@ namespace App\Console\Commands\Update; use App\Models\Collections\Asset; - use Aic\Hub\Foundation\AbstractCommand as BaseCommand; class UpdateNetx extends BaseCommand diff --git a/app/Console/Commands/Update/UpdateResources.php b/app/Console/Commands/Update/UpdateResources.php index 376fe05f..357604e1 100644 --- a/app/Console/Commands/Update/UpdateResources.php +++ b/app/Console/Commands/Update/UpdateResources.php @@ -3,7 +3,6 @@ namespace App\Console\Commands\Update; use App\Models\Collections\Artwork; - use Aic\Hub\Foundation\AbstractCommand as BaseCommand; class UpdateResources extends BaseCommand diff --git a/app/ElasticsearchEngine.php b/app/ElasticsearchEngine.php index dc5e5e7a..0d493504 100644 --- a/app/ElasticsearchEngine.php +++ b/app/ElasticsearchEngine.php @@ -3,7 +3,6 @@ namespace App; use Exception; - use Tamayo\LaravelScoutElastic\Engines\ElasticsearchEngine as BaseEngine; class ElasticsearchEngine extends BaseEngine diff --git a/app/Http/Controllers/AbstractController.php b/app/Http/Controllers/AbstractController.php index b0891ab2..ea9064cb 100644 --- a/app/Http/Controllers/AbstractController.php +++ b/app/Http/Controllers/AbstractController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; - use Illuminate\Contracts\Support\Arrayable; use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Illuminate\Database\Eloquent\Model; @@ -11,16 +10,13 @@ use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Request as RequestFacade; use Closure; - use League\Fractal\Resource\Item; use League\Fractal\Resource\Collection; - use Aic\Hub\Foundation\ResourceSerializer; use Aic\Hub\Foundation\Exceptions\BigLimitException; use Aic\Hub\Foundation\Exceptions\InvalidSyntaxException; use Aic\Hub\Foundation\Exceptions\ItemNotFoundException; use Aic\Hub\Foundation\Exceptions\TooManyIdsException; - use Aic\Hub\Foundation\AbstractController as BaseController; abstract class AbstractController extends BaseController diff --git a/app/Http/Controllers/ArtworkController.php b/app/Http/Controllers/ArtworkController.php index 1f0978af..0f638155 100644 --- a/app/Http/Controllers/ArtworkController.php +++ b/app/Http/Controllers/ArtworkController.php @@ -3,13 +3,10 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; - use League\Fractal\Resource\Item; use League\Fractal\Serializer\ArraySerializer; - use App\Models\Collections\Artwork; use App\Transformers\Outbound\Collections\ArtworkManifest; - use Aic\Hub\Foundation\Exceptions\InvalidSyntaxException; use Aic\Hub\Foundation\Exceptions\ItemNotFoundException; diff --git a/app/Http/Controllers/ImageSearchController.php b/app/Http/Controllers/ImageSearchController.php index afe5097a..72065799 100644 --- a/app/Http/Controllers/ImageSearchController.php +++ b/app/Http/Controllers/ImageSearchController.php @@ -7,7 +7,6 @@ use Aic\Hub\Foundation\Exceptions\DetailedException; use Illuminate\Support\Facades\Route; use App\Library\Shell; - use App\Http\Controllers\SearchController as BaseController; class ImageSearchController extends BaseController diff --git a/app/Http/Controllers/LinkedArtController.php b/app/Http/Controllers/LinkedArtController.php index 8a817f6a..01599c23 100644 --- a/app/Http/Controllers/LinkedArtController.php +++ b/app/Http/Controllers/LinkedArtController.php @@ -11,7 +11,6 @@ use App\Models\Collections\Asset; use Aic\Hub\Foundation\Exceptions\InvalidSyntaxException; use Aic\Hub\Foundation\Exceptions\TooManyIdsException; - use App\Http\Controllers\Controller as BaseController; class LinkedArtController extends BaseController diff --git a/app/Http/Controllers/LinkedArtSearchController.php b/app/Http/Controllers/LinkedArtSearchController.php index 8b2c3a06..e197d4ed 100644 --- a/app/Http/Controllers/LinkedArtSearchController.php +++ b/app/Http/Controllers/LinkedArtSearchController.php @@ -4,7 +4,6 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Route; - use App\Http\Controllers\SearchController as BaseController; class LinkedArtSearchController extends BaseController diff --git a/app/Http/Controllers/RestrictedResourceController.php b/app/Http/Controllers/RestrictedResourceController.php index 6a8044ab..e6bffb38 100644 --- a/app/Http/Controllers/RestrictedResourceController.php +++ b/app/Http/Controllers/RestrictedResourceController.php @@ -4,7 +4,6 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Gate; - use Aic\Hub\Foundation\Exceptions\UnauthorizedException; class RestrictedResourceController extends ResourceController diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 11a5f68d..39bc1f48 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -3,15 +3,12 @@ namespace App\Http\Controllers; use Aic\Hub\Foundation\Exceptions\DetailedException; - use App\Http\Search\Request as SearchRequest; use App\Http\Search\Response as SearchResponse; - use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Request as RequestFacade; use Illuminate\Http\Request; use Elasticsearch; - use Illuminate\Routing\Controller as BaseController; class SearchController extends BaseController diff --git a/app/Http/Middleware/RestrictContent.php b/app/Http/Middleware/RestrictContent.php index 6db28ed9..3d104930 100644 --- a/app/Http/Middleware/RestrictContent.php +++ b/app/Http/Middleware/RestrictContent.php @@ -3,13 +3,10 @@ namespace App\Http\Middleware; use Carbon\Carbon; - use Closure; - use Illuminate\Http\Request; use Illuminate\Support\Facades\Gate; use Symfony\Component\HttpFoundation\Response; - use App\Models\BaseModel; use App\Scopes\PublishedScope; @@ -37,7 +34,8 @@ public static function getSearchRestrictForEndpoint($endpoint) { $restrictions = []; - if (in_array($endpoint, [ + if ( + in_array($endpoint, [ 'articles', 'digital-catalogs', 'educator-resources', @@ -50,14 +48,17 @@ public static function getSearchRestrictForEndpoint($endpoint) // WEB-1929: Re-enable restriction when ready! // 'events', - ])) { + ]) + ) { $restrictions = array_merge($restrictions, PublishedScope::forSearch()); } - if (in_array($endpoint, [ + if ( + in_array($endpoint, [ 'events', 'event-occurrences', - ])) { + ]) + ) { $restrictions[] = [ 'term' => [ 'is_private' => false, diff --git a/app/Http/Search/Request.php b/app/Http/Search/Request.php index 0d22f745..ff14624c 100644 --- a/app/Http/Search/Request.php +++ b/app/Http/Search/Request.php @@ -5,12 +5,9 @@ use Aic\Hub\Foundation\Exceptions\BigLimitException; use Aic\Hub\Foundation\Exceptions\DetailedException; use Aic\Hub\Foundation\Exceptions\TooManyResultsException; - use App\Http\Middleware\RestrictContent; - use Illuminate\Support\Arr; use Illuminate\Support\Facades\Gate; - use Illuminate\Support\Facades\Request as RequestFacade; class Request @@ -934,11 +931,13 @@ private function getFuzzy(array $input, string $query = null, $isExact = false) private function getColorParams(array $params, array $input) { // Exit early if the query is not an exact hex string - if (!( - strlen($input['q']) === 7 && preg_match('/^#[0-9a-f]{6}/i', $input['q']) - ) || ( - strlen($input['q']) === 4 && preg_match('/^#[0-9a-f]{3}/i', $input['q']) - )) { + if ( + !( + strlen($input['q']) === 7 && preg_match('/^#[0-9a-f]{6}/i', $input['q']) + ) || ( + strlen($input['q']) === 4 && preg_match('/^#[0-9a-f]{3}/i', $input['q']) + ) + ) { return false; } diff --git a/app/Library/Migrations/CreateIndexMigration.php b/app/Library/Migrations/CreateIndexMigration.php index 38bd0648..732d1f4f 100644 --- a/app/Library/Migrations/CreateIndexMigration.php +++ b/app/Library/Migrations/CreateIndexMigration.php @@ -3,7 +3,6 @@ namespace App\Library\Migrations; use Aic\Hub\Foundation\Concerns\HasAbstractProperties; - use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; diff --git a/app/Library/Migrations/RenameColumnMigration.php b/app/Library/Migrations/RenameColumnMigration.php index 7d14aa69..22445e03 100644 --- a/app/Library/Migrations/RenameColumnMigration.php +++ b/app/Library/Migrations/RenameColumnMigration.php @@ -3,7 +3,6 @@ namespace App\Library\Migrations; use Aic\Hub\Foundation\Concerns\HasAbstractProperties; - use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php index a7d40c88..7f3e2744 100644 --- a/app/Models/BaseModel.php +++ b/app/Models/BaseModel.php @@ -3,9 +3,7 @@ namespace App\Models; use Carbon\Carbon; - use Aic\Hub\Foundation\AbstractModel; - use App\BelongsToManyOrOne; use App\Scopes\PublishedScope; use App\Models\Collections\Exhibition; @@ -22,7 +20,6 @@ use App\Models\Web\PrintedCatalog; use App\Models\Web\Highlight; use App\Models\Web\StaticPage; - use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; diff --git a/app/Models/Collections/Artwork.php b/app/Models/Collections/Artwork.php index 58d56059..c78df504 100644 --- a/app/Models/Collections/Artwork.php +++ b/app/Models/Collections/Artwork.php @@ -5,7 +5,6 @@ use App\Models\CollectionsModel; use App\Models\ElasticSearchable; use App\Models\HasRelationships; - use Illuminate\Support\Str; /** diff --git a/app/Models/Documentable.php b/app/Models/Documentable.php index e56bdafb..d1895f77 100644 --- a/app/Models/Documentable.php +++ b/app/Models/Documentable.php @@ -3,9 +3,7 @@ namespace App\Models; use Laminas\Code\Reflection\ClassReflection; - use Illuminate\Support\Str; - use App\Scopes\PublishedScope; trait Documentable diff --git a/app/Models/ElasticSearchable.php b/app/Models/ElasticSearchable.php index e8bc2cf2..3476c08d 100644 --- a/app/Models/ElasticSearchable.php +++ b/app/Models/ElasticSearchable.php @@ -3,7 +3,6 @@ namespace App\Models; use Laravel\Scout\Searchable; - use Illuminate\Support\Str; trait ElasticSearchable diff --git a/app/Providers/SearchServiceProvider.php b/app/Providers/SearchServiceProvider.php index d4c2de1e..0bd03d34 100644 --- a/app/Providers/SearchServiceProvider.php +++ b/app/Providers/SearchServiceProvider.php @@ -7,7 +7,6 @@ // use ScoutEngines\Elasticsearch\ElasticsearchEngine; use Illuminate\Support\ServiceProvider; use Illuminate\Support\Str; - // TODO: Remove this after we're ready to handle exceptions use App\ElasticsearchEngine; diff --git a/app/Transformers/Inbound/BaseTransformer.php b/app/Transformers/Inbound/BaseTransformer.php index 0aa3e82d..7eeeddbf 100644 --- a/app/Transformers/Inbound/BaseTransformer.php +++ b/app/Transformers/Inbound/BaseTransformer.php @@ -3,10 +3,8 @@ namespace App\Transformers\Inbound; use App\Transformers\Datum; - use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Schema; - use App\Transformers\AbstractTransformer; class BaseTransformer extends AbstractTransformer diff --git a/app/Transformers/Inbound/Collections/Artwork.php b/app/Transformers/Inbound/Collections/Artwork.php index fcb2cfdb..248452fa 100644 --- a/app/Transformers/Inbound/Collections/Artwork.php +++ b/app/Transformers/Inbound/Collections/Artwork.php @@ -3,14 +3,10 @@ namespace App\Transformers\Inbound\Collections; use Illuminate\Database\Eloquent\Model; - use App\Models\Collections\ArtworkDate; - use App\Transformers\Datum; use App\Transformers\Inbound\CollectionsTransformer; - use App\Transformers\Traits\ConvertsToHtml; - use Carbon\Carbon; class Artwork extends CollectionsTransformer diff --git a/app/Transformers/Inbound/Collections/BaseList.php b/app/Transformers/Inbound/Collections/BaseList.php index 13a999b4..4e5f3459 100644 --- a/app/Transformers/Inbound/Collections/BaseList.php +++ b/app/Transformers/Inbound/Collections/BaseList.php @@ -3,7 +3,6 @@ namespace App\Transformers\Inbound\Collections; use Illuminate\Database\Eloquent\Model; - use App\Transformers\Inbound\CollectionsTransformer; class BaseList extends CollectionsTransformer diff --git a/app/Transformers/Inbound/Collections/Term.php b/app/Transformers/Inbound/Collections/Term.php index 9722a5de..ea6a20f4 100644 --- a/app/Transformers/Inbound/Collections/Term.php +++ b/app/Transformers/Inbound/Collections/Term.php @@ -3,7 +3,6 @@ namespace App\Transformers\Inbound\Collections; use Illuminate\Database\Eloquent\Model; - use App\Transformers\Datum; class Term extends BaseList diff --git a/app/Transformers/Inbound/Membership/TicketedEvent.php b/app/Transformers/Inbound/Membership/TicketedEvent.php index 46b06276..15da6a4e 100644 --- a/app/Transformers/Inbound/Membership/TicketedEvent.php +++ b/app/Transformers/Inbound/Membership/TicketedEvent.php @@ -3,7 +3,6 @@ namespace App\Transformers\Inbound\Membership; use Carbon\Carbon; - use App\Transformers\Datum; use App\Transformers\Inbound\MembershipTransformer; diff --git a/app/Transformers/Inbound/Web/HasBlocks.php b/app/Transformers/Inbound/Web/HasBlocks.php index a56f8f79..a77dc64f 100644 --- a/app/Transformers/Inbound/Web/HasBlocks.php +++ b/app/Transformers/Inbound/Web/HasBlocks.php @@ -4,7 +4,6 @@ use Illuminate\Support\Arr; use Illuminate\Support\Collection; - use App\Transformers\Datum; trait HasBlocks diff --git a/app/Transformers/Outbound/AbstractTransformer.php b/app/Transformers/Outbound/AbstractTransformer.php index 19e78d89..0800ecac 100644 --- a/app/Transformers/Outbound/AbstractTransformer.php +++ b/app/Transformers/Outbound/AbstractTransformer.php @@ -4,9 +4,7 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Gate; - use Carbon\Carbon; - use League\Fractal\TransformerAbstract as BaseTransformer; abstract class AbstractTransformer extends BaseTransformer diff --git a/app/Transformers/Outbound/Collections/Agent.php b/app/Transformers/Outbound/Collections/Agent.php index a926a33c..8c0fab68 100644 --- a/app/Transformers/Outbound/Collections/Agent.php +++ b/app/Transformers/Outbound/Collections/Agent.php @@ -4,7 +4,6 @@ use App\Transformers\Outbound\HasSuggestFields; use App\Transformers\Outbound\Collections\Traits\IsCC0; - use App\Transformers\Outbound\CollectionsTransformer as BaseTransformer; class Agent extends BaseTransformer diff --git a/app/Transformers/Outbound/Collections/Artwork.php b/app/Transformers/Outbound/Collections/Artwork.php index 5133b503..b89982c5 100644 --- a/app/Transformers/Outbound/Collections/Artwork.php +++ b/app/Transformers/Outbound/Collections/Artwork.php @@ -3,18 +3,14 @@ namespace App\Transformers\Outbound\Collections; use App\Models\Collections\Asset; - use App\Transformers\Outbound\Collections\ArtworkArtistPivot as ArtworkArtistPivotTransformer; use App\Transformers\Outbound\Collections\ArtworkDate as ArtworkDateTransformer; use App\Transformers\Outbound\Collections\ArtworkPlacePivot as ArtworkPlacePivotTransformer; use App\Transformers\Outbound\StaticArchive\Site as SiteTransformer; - use App\Transformers\Outbound\Collections\Traits\HasBoosted; use App\Transformers\Outbound\Collections\Traits\IsCC0; use App\Transformers\Outbound\HasSuggestFields; - use App\Transformers\Outbound\CollectionsTransformer as BaseTransformer; - use Illuminate\Support\Arr; use Illuminate\Support\Str; diff --git a/app/Transformers/Outbound/Collections/ArtworkArtistPivot.php b/app/Transformers/Outbound/Collections/ArtworkArtistPivot.php index 73c77246..207a4bd2 100644 --- a/app/Transformers/Outbound/Collections/ArtworkArtistPivot.php +++ b/app/Transformers/Outbound/Collections/ArtworkArtistPivot.php @@ -5,9 +5,7 @@ use App\Transformers\Outbound\Collections\Artwork as ArtworkTransformer; use App\Transformers\Outbound\Collections\Agent as AgentTransformer; use App\Transformers\Outbound\CollectionsTransformer; - use App\Transformers\Outbound\Collections\Traits\HidesDefaultFields; - use App\Transformers\Outbound\CollectionsTransformer as BaseTransformer; class ArtworkArtistPivot extends BaseTransformer diff --git a/app/Transformers/Outbound/Collections/ArtworkDate.php b/app/Transformers/Outbound/Collections/ArtworkDate.php index 09818044..2c495845 100644 --- a/app/Transformers/Outbound/Collections/ArtworkDate.php +++ b/app/Transformers/Outbound/Collections/ArtworkDate.php @@ -3,7 +3,6 @@ namespace App\Transformers\Outbound\Collections; use App\Transformers\Outbound\Collections\Traits\HidesDefaultFields; - use App\Transformers\Outbound\CollectionsTransformer as BaseTransformer; class ArtworkDate extends BaseTransformer diff --git a/app/Transformers/Outbound/Collections/ArtworkManifest.php b/app/Transformers/Outbound/Collections/ArtworkManifest.php index 0cea39cd..84cb914c 100644 --- a/app/Transformers/Outbound/Collections/ArtworkManifest.php +++ b/app/Transformers/Outbound/Collections/ArtworkManifest.php @@ -3,7 +3,6 @@ namespace App\Transformers\Outbound\Collections; use League\Fractal\TransformerAbstract as BaseTransformer; - use App\Models\Collections\Artwork; use App\Models\Collections\Asset; use App\Transformers\Outbound\Collections\Traits\IsCC0; diff --git a/app/Transformers/Outbound/Collections/ArtworkPlacePivot.php b/app/Transformers/Outbound/Collections/ArtworkPlacePivot.php index bd782a57..3554d72a 100644 --- a/app/Transformers/Outbound/Collections/ArtworkPlacePivot.php +++ b/app/Transformers/Outbound/Collections/ArtworkPlacePivot.php @@ -5,9 +5,7 @@ use App\Transformers\Outbound\Collections\Artwork as ArtworkTransformer; use App\Transformers\Outbound\Collections\Place as PlaceTransformer; use App\Transformers\Outbound\CollectionsTransformer; - use App\Transformers\Outbound\Collections\Traits\HidesDefaultFields; - use App\Transformers\Outbound\CollectionsTransformer as BaseTransformer; class ArtworkPlacePivot extends BaseTransformer diff --git a/app/Transformers/Outbound/Collections/Asset.php b/app/Transformers/Outbound/Collections/Asset.php index b80289a2..52baf1e4 100644 --- a/app/Transformers/Outbound/Collections/Asset.php +++ b/app/Transformers/Outbound/Collections/Asset.php @@ -5,7 +5,6 @@ use App\Models\Collections\Asset as AssetModel; use App\Transformers\Outbound\Collections\Traits\HasLakeFields; use App\Transformers\Outbound\Collections\Traits\IsCC0; - use App\Transformers\Outbound\CollectionsTransformer as BaseTransformer; class Asset extends BaseTransformer diff --git a/app/Transformers/Outbound/Collections/CategoryTerm.php b/app/Transformers/Outbound/Collections/CategoryTerm.php index 51bb0aa2..0dcb4bcd 100644 --- a/app/Transformers/Outbound/Collections/CategoryTerm.php +++ b/app/Transformers/Outbound/Collections/CategoryTerm.php @@ -5,7 +5,6 @@ use App\Transformers\Outbound\HasSuggestFields; use App\Transformers\Outbound\Collections\Traits\IsCC0; use App\Transformers\Outbound\Collections\Traits\HasAatId; - use App\Transformers\Outbound\CollectionsTransformer as BaseTransformer; class CategoryTerm extends BaseTransformer diff --git a/app/Transformers/Outbound/Collections/Exhibition.php b/app/Transformers/Outbound/Collections/Exhibition.php index 8ae274ac..faf2596e 100644 --- a/app/Transformers/Outbound/Collections/Exhibition.php +++ b/app/Transformers/Outbound/Collections/Exhibition.php @@ -3,13 +3,10 @@ namespace App\Transformers\Outbound\Collections; use App\Models\Collections\Asset; - use App\Transformers\Outbound\Collections\Artwork as ArtworkTransformer; use App\Transformers\Outbound\StaticArchive\Site as SiteTransformer; - use App\Transformers\Outbound\HasSuggestFields; use App\Transformers\Outbound\Collections\Traits\IsCC0; - use App\Transformers\Outbound\CollectionsTransformer as BaseTransformer; class Exhibition extends BaseTransformer diff --git a/app/Transformers/Outbound/Membership/TicketedEvent.php b/app/Transformers/Outbound/Membership/TicketedEvent.php index 0716799f..d001410c 100644 --- a/app/Transformers/Outbound/Membership/TicketedEvent.php +++ b/app/Transformers/Outbound/Membership/TicketedEvent.php @@ -3,7 +3,6 @@ namespace App\Transformers\Outbound\Membership; use App\Transformers\Outbound\Web\Event as EventTransformer; - use App\Transformers\Outbound\AbstractTransformer as BaseTransformer; class TicketedEvent extends BaseTransformer diff --git a/app/Transformers/Outbound/Mobile/Tour.php b/app/Transformers/Outbound/Mobile/Tour.php index da4cadeb..99eba0f1 100644 --- a/app/Transformers/Outbound/Mobile/Tour.php +++ b/app/Transformers/Outbound/Mobile/Tour.php @@ -3,9 +3,7 @@ namespace App\Transformers\Outbound\Mobile; use App\Transformers\Outbound\Mobile\TourStop as TourStopTransformer; - use App\Transformers\Outbound\HasSuggestFields; - use App\Transformers\Outbound\AbstractTransformer as BaseTransformer; class Tour extends BaseTransformer diff --git a/app/Transformers/Outbound/StaticArchive/Site.php b/app/Transformers/Outbound/StaticArchive/Site.php index 7079579e..cd6db923 100644 --- a/app/Transformers/Outbound/StaticArchive/Site.php +++ b/app/Transformers/Outbound/StaticArchive/Site.php @@ -3,7 +3,6 @@ namespace App\Transformers\Outbound\StaticArchive; use App\Transformers\Outbound\Collections\Artwork as ArtworkTransformer; - use App\Transformers\Outbound\AbstractTransformer as BaseTransformer; class Site extends BaseTransformer diff --git a/app/Transformers/Outbound/Web/Event.php b/app/Transformers/Outbound/Web/Event.php index e00b5d02..1942df9f 100644 --- a/app/Transformers/Outbound/Web/Event.php +++ b/app/Transformers/Outbound/Web/Event.php @@ -4,7 +4,6 @@ use App\Models\Web\EventProgram; use App\Transformers\Outbound\Web\Traits\HasSearchTags; - use App\Transformers\Outbound\AbstractTransformer as BaseTransformer; class Event extends BaseTransformer diff --git a/app/Transformers/Outbound/Web/GenericPage.php b/app/Transformers/Outbound/Web/GenericPage.php index d3549cf8..9db23876 100644 --- a/app/Transformers/Outbound/Web/GenericPage.php +++ b/app/Transformers/Outbound/Web/GenericPage.php @@ -3,7 +3,6 @@ namespace App\Transformers\Outbound\Web; use App\Transformers\Outbound\Web\Traits\HasSearchTags; - use App\Transformers\Outbound\Web\Page as BaseTransformer; class GenericPage extends BaseTransformer diff --git a/config/broadcasting.php b/config/broadcasting.php index aef1ae0f..3757aae5 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -36,7 +36,7 @@ 'app_id' => env('PUSHER_APP_ID'), 'options' => [ 'cluster' => env('PUSHER_APP_CLUSTER'), - 'host' => env('PUSHER_HOST') ?: 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com', + 'host' => env('PUSHER_HOST') ?: 'api-' . env('PUSHER_APP_CLUSTER', 'mt1') . '.pusher.com', 'port' => env('PUSHER_PORT', 443), 'scheme' => env('PUSHER_SCHEME', 'https'), 'encrypted' => true, diff --git a/config/logging.php b/config/logging.php index e2aafba1..f7d1d3f8 100644 --- a/config/logging.php +++ b/config/logging.php @@ -82,7 +82,7 @@ 'handler_with' => [ 'host' => env('PAPERTRAIL_URL'), 'port' => env('PAPERTRAIL_PORT'), - 'connectionString' => 'tls://'.env('PAPERTRAIL_URL').':'.env('PAPERTRAIL_PORT'), + 'connectionString' => 'tls://' . env('PAPERTRAIL_URL') . ':' . env('PAPERTRAIL_PORT'), ], 'processors' => [PsrLogMessageProcessor::class], ], diff --git a/config/session.php b/config/session.php index 8fed97c0..1b99f221 100644 --- a/config/session.php +++ b/config/session.php @@ -128,7 +128,7 @@ 'cookie' => env( 'SESSION_COOKIE', - Str::slug(env('APP_NAME', 'laravel'), '_').'_session' + Str::slug(env('APP_NAME', 'laravel'), '_') . '_session' ), /* diff --git a/database/migrations/2020_06_09_135354_change_id_to_uuid_in_event_occurrences.php b/database/migrations/2020_06_09_135354_change_id_to_uuid_in_event_occurrences.php index a202c136..73d6287e 100644 --- a/database/migrations/2020_06_09_135354_change_id_to_uuid_in_event_occurrences.php +++ b/database/migrations/2020_06_09_135354_change_id_to_uuid_in_event_occurrences.php @@ -1,7 +1,6 @@ dropIndexIfExists(['citi_id', 'updated_at']); $table->dropIndexIfExists(['citi_id', 'updated_at_desc']); diff --git a/database/migrations/2022_07_11_103040_drop_is_published.php b/database/migrations/2022_07_11_103040_drop_is_published.php index 630949bb..6f1d7850 100644 --- a/database/migrations/2022_07_11_103040_drop_is_published.php +++ b/database/migrations/2022_07_11_103040_drop_is_published.php @@ -7,7 +7,8 @@ return new class () extends Migration { public function up(): void { - foreach ([ + foreach ( + [ 'articles', 'assets', 'digital_catalogs', @@ -23,7 +24,8 @@ public function up(): void 'press_releases', 'printed_catalogs', 'web_exhibitions', - ] as $tableName) { + ] as $tableName + ) { Schema::table($tableName, function (Blueprint $table) { $table->dropColumn(['is_published']); }); diff --git a/database/migrations/2022_07_12_120430_drop_date_columns.php b/database/migrations/2022_07_12_120430_drop_date_columns.php index 9869a973..07e3b979 100644 --- a/database/migrations/2022_07_12_120430_drop_date_columns.php +++ b/database/migrations/2022_07_12_120430_drop_date_columns.php @@ -7,12 +7,14 @@ return new class () extends Migration { public function up(): void { - foreach ([ + foreach ( + [ 'articles', 'digital_publication_sections', 'issue_articles', 'issues', - ] as $tableName) { + ] as $tableName + ) { Schema::table($tableName, function (Blueprint $table) { $table->dropColumn(['date']); }); diff --git a/database/migrations/2022_07_15_103525_drop_imgix_uuid_columns.php b/database/migrations/2022_07_15_103525_drop_imgix_uuid_columns.php index c0bc6a1f..0610660a 100644 --- a/database/migrations/2022_07_15_103525_drop_imgix_uuid_columns.php +++ b/database/migrations/2022_07_15_103525_drop_imgix_uuid_columns.php @@ -7,14 +7,16 @@ return new class () extends Migration { public function up(): void { - foreach ([ + foreach ( + [ 'articles', 'digital_catalogs', 'educator_resources', 'generic_pages', 'press_releases', 'printed_catalogs', - ] as $tableName) { + ] as $tableName + ) { Schema::table($tableName, function (Blueprint $table) { $table->dropColumn('imgix_uuid'); }); diff --git a/database/migrations/2022_07_15_112102_drop_slug_columns.php b/database/migrations/2022_07_15_112102_drop_slug_columns.php index 03e0740c..5dde6022 100644 --- a/database/migrations/2022_07_15_112102_drop_slug_columns.php +++ b/database/migrations/2022_07_15_112102_drop_slug_columns.php @@ -7,14 +7,16 @@ return new class () extends Migration { public function up(): void { - foreach ([ + foreach ( + [ 'digital_catalogs', 'digital_publication_sections', 'educator_resources', 'generic_pages', 'press_releases', 'printed_catalogs', - ] as $tableName) { + ] as $tableName + ) { Schema::table($tableName, function (Blueprint $table) { $table->dropColumn('slug'); }); @@ -23,14 +25,16 @@ public function up(): void public function down(): void { - foreach ([ + foreach ( + [ 'digital_catalogs', 'digital_publication_sections', 'educator_resources', 'generic_pages', 'press_releases', 'printed_catalogs', - ] as $tableName) { + ] as $tableName + ) { Schema::table($tableName, function (Blueprint $table) { $table->string('slug')->nullable()->after('web_url'); }); diff --git a/public/index.php b/public/index.php index 35afea5b..43a28993 100644 --- a/public/index.php +++ b/public/index.php @@ -16,8 +16,8 @@ | */ -if (file_exists(__DIR__.'/../storage/framework/maintenance.php')) { - require __DIR__.'/../storage/framework/maintenance.php'; +if (file_exists(__DIR__ . '/../storage/framework/maintenance.php')) { + require __DIR__ . '/../storage/framework/maintenance.php'; } /* @@ -31,7 +31,7 @@ | */ -require __DIR__.'/../vendor/autoload.php'; +require __DIR__ . '/../vendor/autoload.php'; /* |-------------------------------------------------------------------------- @@ -45,7 +45,7 @@ | */ -$app = require_once __DIR__.'/../bootstrap/app.php'; +$app = require_once __DIR__ . '/../bootstrap/app.php'; $kernel = $app->make(Kernel::class); diff --git a/routes/api.php b/routes/api.php index 4bd8d332..87d763da 100644 --- a/routes/api.php +++ b/routes/api.php @@ -4,7 +4,6 @@ use Illuminate\Support\Facades\Route; use App\Http\Controllers\ResourceController; use App\Http\Controllers\RestrictedResourceController; - use App\Http\Controllers\SwaggerController; use App\Http\Controllers\SearchController; use App\Http\Controllers\ImageSearchController; diff --git a/tests/TestCase.php b/tests/TestCase.php index 37774946..5107ebea 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -3,7 +3,6 @@ namespace Tests; use Tests\Helpers\Factory; - use Illuminate\Foundation\Testing\TestCase as BaseTestCase; use Illuminate\Foundation\Testing\RefreshDatabase; diff --git a/tests/Unit/ArtworkTest.php b/tests/Unit/ArtworkTest.php index f6d4c572..dfa8c59c 100644 --- a/tests/Unit/ArtworkTest.php +++ b/tests/Unit/ArtworkTest.php @@ -4,7 +4,6 @@ use Tests\TestCase; use Illuminate\Foundation\Testing\RefreshDatabase; - use App\Models\Collections\Artwork; use App\Models\Collections\ArtworkType; use App\Models\Collections\Gallery; diff --git a/tests/Unit/DigitalPublicationSectionTest.php b/tests/Unit/DigitalPublicationSectionTest.php index d8107279..25028c7f 100644 --- a/tests/Unit/DigitalPublicationSectionTest.php +++ b/tests/Unit/DigitalPublicationSectionTest.php @@ -4,7 +4,6 @@ use Tests\TestCase; use Illuminate\Foundation\Testing\RefreshDatabase; - use App\Models\Web\DigitalPublicationSection; class DigitalPublicationSectionTest extends TestCase diff --git a/tests/Unit/ExhibitionTest.php b/tests/Unit/ExhibitionTest.php index 415983fc..cd23c2b5 100644 --- a/tests/Unit/ExhibitionTest.php +++ b/tests/Unit/ExhibitionTest.php @@ -4,7 +4,6 @@ use Tests\TestCase; use Illuminate\Foundation\Testing\RefreshDatabase; - use App\Models\Collections\Exhibition; use App\Models\Collections\ArtworkType; use App\Models\Collections\Gallery; diff --git a/tests/Unit/PlaceTest.php b/tests/Unit/PlaceTest.php index 04a86538..94ebebe2 100644 --- a/tests/Unit/PlaceTest.php +++ b/tests/Unit/PlaceTest.php @@ -4,7 +4,6 @@ use Tests\TestCase; use Illuminate\Foundation\Testing\RefreshDatabase; - use App\Models\Collections\Place; class PlaceTest extends TestCase diff --git a/tests/Unit/TermTest.php b/tests/Unit/TermTest.php index d6fc53ff..8e6dfeb0 100644 --- a/tests/Unit/TermTest.php +++ b/tests/Unit/TermTest.php @@ -4,7 +4,6 @@ use Tests\TestCase; use Illuminate\Foundation\Testing\RefreshDatabase; - use App\Models\Collections\Term; class TermTest extends TestCase