Skip to content

Commit 315cf49

Browse files
committed
Update trait usages.
1 parent e9792dd commit 315cf49

10 files changed

Lines changed: 37 additions & 37 deletions

File tree

src/Auth/Protect/Tags.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
namespace Statamic\Auth\Protect;
44

55
use Illuminate\Support\ViewErrorBag;
6+
use Statamic\Tags\Concerns;
67
use Statamic\Tags\Tags as BaseTags;
7-
use Statamic\Tags\Traits\RendersForms;
88

99
class Tags extends BaseTags
1010
{
11-
use RendersForms;
11+
use Concerns\RendersForms;
1212

1313
protected static $handle = 'protect';
1414

src/Auth/UserTags.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
use Statamic\Fields\Field;
1010
use Statamic\Support\Arr;
1111
use Statamic\Tags\Tags;
12-
use Statamic\Tags\Traits\RendersForms;
12+
use Statamic\Tags\Concerns;
1313

1414
class UserTags extends Tags
1515
{
16-
use RendersForms;
16+
use Concerns\RendersForms;
1717

1818
protected static $handle = 'user';
1919

src/Forms/Tags.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
use Illuminate\Support\Facades\Crypt;
88
use Statamic\Facades\Form;
99
use Statamic\Facades\URL;
10-
use Statamic\Tags\OutputsItems;
10+
use Statamic\Tags\Concerns;
1111
use Statamic\Tags\Tags as BaseTags;
12-
use Statamic\Tags\Traits\RendersForms;
1312

1413
class Tags extends BaseTags
1514
{
16-
use OutputsItems, RendersForms;
15+
use Concerns\OutputsItems,
16+
Concerns\RendersForms;
1717

1818
const HANDLE_PARAM = ['handle', 'is', 'in', 'form', 'formset'];
1919

src/Http/Controllers/API/ApiController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
use Statamic\Http\Controllers\Controller;
77
use Statamic\Statamic;
88
use Statamic\Support\Str;
9-
use Statamic\Tags\Query\HasConditions;
9+
use Statamic\Tags\Concerns\QueriesConditions;
1010

1111
class ApiController extends Controller
1212
{
13-
use HasConditions;
13+
use QueriesConditions;
1414

1515
/**
1616
* @var \Illuminate\Http\Request

src/Search/Tags.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
namespace Statamic\Search;
44

55
use Statamic\Facades\Search;
6-
use Statamic\Tags\OutputsItems;
6+
use Statamic\Tags\Concerns;
77
use Statamic\Tags\Tags as BaseTags;
88

99
class Tags extends BaseTags
1010
{
11-
use OutputsItems;
11+
use Concerns\OutputsItems;
1212

1313
protected static $handle = 'search';
1414

src/Tags/Collection/Collection.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace Statamic\Tags\Collection;
44

5-
use Statamic\Facades\URL;
5+
use Statamic\Entries\EntryCollection;
66
use Statamic\Facades\Entry;
7+
use Statamic\Facades\URL;
8+
use Statamic\Tags\Concerns;
79
use Statamic\Tags\Tags;
8-
use Statamic\Tags\OutputsItems;
9-
use Statamic\Entries\EntryCollection;
1010

1111
class Collection extends Tags
1212
{
13-
use OutputsItems;
13+
use Concerns\OutputsItems;
1414

1515
protected $defaultAsKey = 'entries';
1616

src/Tags/Collection/Entries.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
use Statamic\Facades\Entry;
1111
use Statamic\Facades\Site;
1212
use Statamic\Support\Str;
13-
use Statamic\Tags\Query;
13+
use Statamic\Tags\Concerns;
1414

1515
class Entries
1616
{
17-
use Query\HasConditions,
18-
Query\HasScopes,
19-
Query\HasOrderBys,
20-
Query\GetsResults;
17+
use Concerns\QueriesConditions,
18+
Concerns\QueriesScopes,
19+
Concerns\QueriesOrderBys,
20+
Concerns\GetsQueryResults;
2121

2222
protected $ignoredParams = ['as'];
2323
protected $parameters;

src/Tags/Taxonomy/Taxonomy.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
use Statamic\Facades\Site;
66
use Statamic\Support\Arr;
7-
use Statamic\Tags\OutputsItems;
7+
use Statamic\Tags\Concerns;
88
use Statamic\Tags\Tags;
99

1010
class Taxonomy extends Tags
1111
{
12-
use OutputsItems;
12+
use Concerns\OutputsItems;
1313

1414
protected $defaultAsKey = 'terms';
1515

src/Tags/Taxonomy/Terms.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
namespace Statamic\Tags\Taxonomy;
44

55
use Closure;
6+
use Illuminate\Support\Carbon;
67
use Statamic\Facades;
7-
use Statamic\Support\Arr;
8+
use Statamic\Facades\Collection;
89
use Statamic\Facades\Site;
9-
use Statamic\Facades\Term;
10-
use Statamic\Tags\Query;
1110
use Statamic\Facades\Taxonomy;
12-
use Statamic\Facades\Collection;
13-
use Illuminate\Support\Carbon;
11+
use Statamic\Facades\Term;
12+
use Statamic\Support\Arr;
13+
use Statamic\Tags\Concerns;
1414
use Statamic\Taxonomies\TermCollection;
1515

1616
class Terms
1717
{
18-
use Query\HasConditions,
19-
Query\HasScopes,
20-
Query\HasOrderBys,
21-
Query\GetsResults;
18+
use Concerns\QueriesConditions,
19+
Concerns\QueriesScopes,
20+
Concerns\QueriesOrderBys,
21+
Concerns\GetsQueryResults;
2222

2323
protected $ignoredParams = ['as'];
2424
protected $parameters;

src/Tags/Users.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
use Statamic\Facades\User;
66
use Statamic\Facades\UserGroup;
7-
use Statamic\Tags\Query;
7+
use Statamic\Tags\Concerns;
88

99
class Users extends Tags
1010
{
11-
use Query\HasConditions,
12-
Query\HasScopes,
13-
Query\HasOrderBys,
14-
Query\GetsResults,
15-
OutputsItems;
11+
use Concerns\QueriesConditions,
12+
Concerns\QueriesScopes,
13+
Concerns\QueriesOrderBys,
14+
Concerns\GetsQueryResults,
15+
Concerns\OutputsItems;
1616

1717
/**
1818
* {{ get_content from="" }} ... {{ /get_content }}

0 commit comments

Comments
 (0)