Skip to content

Commit 0caf241

Browse files
GrahamCampbellGrahamCampbell
committed
Merge branch '7.x'
2 parents 9f176fc + 2279b73 commit 0caf241

File tree

6 files changed

+138
-4
lines changed

6 files changed

+138
-4
lines changed

‎CHANGELOG-6.x.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Release Notes for 6.x
22

3-
## [Unreleased](https://github.com/laravel/framework/compare/v6.18.14...6.x)
3+
## [Unreleased](https://github.com/laravel/framework/compare/v6.18.15...6.x)
4+
5+
6+
## [v6.18.15 (2020-05-19)](https://github.com/laravel/framework/compare/v6.18.14...v6.18.15)
47

58
### Added
69
- Added `Illuminate\Http\Middleware\TrustHosts` ([9229264](https://github.com/laravel/framework/commit/92292649621f2aadc84ab94376244650a9f55696))

‎CHANGELOG-7.x.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
# Release Notes for 7.x
22

3-
## [Unreleased](https://github.com/laravel/framework/compare/v7.11.0...7.x)
3+
## [Unreleased](https://github.com/laravel/framework/compare/v7.12.0...7.x)
4+
5+
6+
## [v7.12.0 (2020-05-19)](https://github.com/laravel/framework/compare/v7.11.0...v7.12.0)
47

58
### Added
69
- Added `Illuminate\Http\Middleware\TrustHosts` ([9229264](https://github.com/laravel/framework/commit/92292649621f2aadc84ab94376244650a9f55696))
10+
- Added ability to skip middleware from resource routes ([#32891](https://github.com/laravel/framework/pull/32891))
711

812
### Fixed
913
- Fixed Queued Mail MessageSent Listener With Attachments ([#32795](https://github.com/laravel/framework/pull/32795))

‎src/Illuminate/Pagination/resources/views/simple-tailwind.blade.php

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
@if ($paginator->hasPages())
2+
<nav role="navigation" aria-label="Pagination Navigation" class="flex justify-between">
3+
{{-- Previous Page Link --}}
4+
@if ($paginator->onFirstPage())
5+
<span class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md">
6+
{!! __('pagination.previous') !!}
7+
</span>
8+
@else
9+
<a href="{{ $paginator->previousPageUrl() }}" rel="prev" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
10+
{!! __('pagination.previous') !!}
11+
</a>
12+
@endif
13+
14+
{{-- Next Page Link --}}
15+
@if ($paginator->hasMorePages())
16+
<a href="{{ $paginator->nextPageUrl() }}" rel="next" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
17+
{!! __('pagination.next') !!}
18+
</a>
19+
@else
20+
<span class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md">
21+
{!! __('pagination.next') !!}
22+
</span>
23+
@endif
24+
</nav>
25+
@endif

‎src/Illuminate/Pagination/resources/views/tailwind.blade.php

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
@if ($paginator->hasPages())
2+
<nav role="navigation" aria-label="Pagination Navigation" class="flex items-center justify-between">
3+
<div class="flex justify-between flex-1 sm:hidden">
4+
@if ($paginator->onFirstPage())
5+
<span class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md">
6+
{!! __('pagination.previous') !!}
7+
</span>
8+
@else
9+
<a href="{{ $paginator->previousPageUrl() }}" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
10+
{!! __('pagination.previous') !!}
11+
</a>
12+
@endif
13+
14+
@if ($paginator->hasMorePages())
15+
<a href="{{ $paginator->nextPageUrl() }}" class="relative inline-flex items-center px-4 py-2 ml-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
16+
{!! __('pagination.next') !!}
17+
</a>
18+
@else
19+
<span class="relative inline-flex items-center px-4 py-2 ml-3 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md">
20+
{!! __('pagination.next') !!}
21+
</span>
22+
@endif
23+
</div>
24+
25+
<div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
26+
<div>
27+
<p class="text-sm text-gray-700 leading-5">
28+
Showing
29+
<span class="font-medium">{{ $paginator->firstItem() }}</span>
30+
to
31+
<span class="font-medium">{{ $paginator->lastItem() }}</span>
32+
of
33+
<span class="font-medium">{{ $paginator->total() }}</span>
34+
results
35+
</p>
36+
</div>
37+
38+
<div>
39+
<span class="relative z-0 inline-flex shadow-sm">
40+
{{-- Previous Page Link --}}
41+
@if ($paginator->onFirstPage())
42+
<span aria-disabled="true" aria-label="{{ __('pagination.previous') }}">
43+
<span class="relative inline-flex items-center px-2 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default rounded-l-md leading-5" aria-hidden="true">
44+
<svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
45+
<path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
46+
</svg>
47+
</span>
48+
</span>
49+
@else
50+
<a href="{{ $paginator->previousPageUrl() }}" rel="prev" class="relative inline-flex items-center px-2 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-l-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150" aria-label="{{ __('pagination.previous') }}">
51+
<svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
52+
<path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
53+
</svg>
54+
</a>
55+
@endif
56+
57+
{{-- Pagination Elements --}}
58+
@foreach ($elements as $element)
59+
{{-- "Three Dots" Separator --}}
60+
@if (is_string($element))
61+
<span aria-disabled="true">
62+
<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-700 bg-white border border-gray-300 cursor-default leading-5">{{ $element }}</span>
63+
</span>
64+
@endif
65+
66+
{{-- Array Of Links --}}
67+
@if (is_array($element))
68+
@foreach ($element as $page => $url)
69+
@if ($page == $paginator->currentPage())
70+
<span aria-current="page">
71+
<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">{{ $page }}</span>
72+
</span>
73+
@else
74+
<a href="{{ $url }}" class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 hover:text-gray-500 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150" aria-label="{{ __('pagination.goto_page', ['page' => $page]) }}">
75+
{{ $page }}
76+
</a>
77+
@endif
78+
@endforeach
79+
@endif
80+
@endforeach
81+
82+
{{-- Next Page Link --}}
83+
@if ($paginator->hasMorePages())
84+
<a href="{{ $paginator->nextPageUrl() }}" rel="next" class="relative inline-flex items-center px-2 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-r-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150" aria-label="{{ __('pagination.next') }}">
85+
<svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
86+
<path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
87+
</svg>
88+
</a>
89+
@else
90+
<span aria-disabled="true" aria-label="{{ __('pagination.next') }}">
91+
<span class="relative inline-flex items-center px-2 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default rounded-r-md leading-5" aria-hidden="true">
92+
<svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
93+
<path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
94+
</svg>
95+
</span>
96+
</span>
97+
@endif
98+
</span>
99+
</div>
100+
</div>
101+
</nav>
102+
@endif

‎src/Illuminate/Routing/PendingResourceRegistration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public function middleware($middleware)
157157
/**
158158
* Specify middleware that should be removed from the resource routes.
159159
*
160-
* @param array|string $middleware
160+
* @param array|string $middleware
161161
* @return $this|array
162162
*/
163163
public function withoutMiddleware($middleware)

‎src/Illuminate/Testing/PendingCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function expectsConfirmation($question, $answer = 'no')
103103
* Specify an expected choice question with expected answers that will be asked/shown when the command runs.
104104
*
105105
* @param string $question
106-
* @param string $answer
106+
* @param string|array $answer
107107
* @param array $answers
108108
* @param bool $strict
109109
* @return $this

0 commit comments

Comments
 (0)