Skip to content

Commit 55e22ed

Browse files
tylercd100tylercd100
authored
Merge pull request #1 from laravel-validation-rules/laravel-5.5
Laravel 5.5
2 parents ccd5f6a + 22894fe commit 55e22ed

File tree

12 files changed

+390
-420
lines changed

12 files changed

+390
-420
lines changed

‎.travis.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
language: php
22

33
php:
4-
- 5.5.9
5-
- 5.6
64
- 7.0
5+
- 7.1
76

87
env:
98
matrix:
@@ -15,9 +14,8 @@ before_script:
1514
- travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
1615

1716
script:
18-
- vendor/bin/phpunit
19-
- if [ "$TRAVIS_PHP_VERSION" == "5.5.9" ] || [ "$TRAVIS_PHP_VERSION" == "5.5" ] || [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; fi
17+
- vendor/bin/phpunit --coverage-clover build/logs/clover.xml
2018

2119
after_script:
22-
- if [ "$TRAVIS_PHP_VERSION" == "5.5.9" ] || [ "$TRAVIS_PHP_VERSION" == "5.5" ] || [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
23-
- if [ "$TRAVIS_PHP_VERSION" == "5.5.9" ] || [ "$TRAVIS_PHP_VERSION" == "5.5" ] || [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi
20+
- wget https://scrutinizer-ci.com/ocular.phar
21+
- php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml

‎LICENSE

Lines changed: 201 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,201 @@
1-
The MIT License (MIT)
2-
3-
Copyright (c) 2017 Tyler Arbon <[email protected]>
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
11-
12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "{}"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright 2017 Scott Wilcox <[email protected]>
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

‎README.md

Lines changed: 37 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,49 @@
1-
# Validate states and provinces for USA and Canada with Laravel 5
2-
[![Latest Version](https://img.shields.io/github/release/laravel-validation-rules/us-state.svg?style=flat-square)](https://github.com/laravel-validation-rules/us-state/releases)
3-
[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)
4-
[![Build Status](https://travis-ci.org/laravel-validation-rules/us-state.svg?branch=master)](https://travis-ci.org/laravel-validation-rules/us-state)
5-
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/laravel-validation-rules/us-state/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/laravel-validation-rules/us-state/?branch=master)
6-
[![Code Coverage](https://scrutinizer-ci.com/g/laravel-validation-rules/us-state/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/laravel-validation-rules/us-state/?branch=master)
7-
[![Total Downloads](https://img.shields.io/packagist/dt/laravel-validation-rules/us-state.svg?style=flat-square)](https://packagist.org/packages/laravel-validation-rules/us-state)
1+
# State
2+
3+
Validate US States and Canada Provinces
4+
5+
<p >
6+
<a href="https://travis-ci.org/laravel-validation-rules/us-state">
7+
<img src="https://img.shields.io/travis/laravel-validation-rules/us-state.svg?style=flat-square">
8+
</a>
9+
<a href="https://scrutinizer-ci.com/g/laravel-validation-rules/us-state/code-structure/master/code-coverage">
10+
<img src="https://img.shields.io/scrutinizer/coverage/g/laravel-validation-rules/us-state.svg?style=flat-square">
11+
</a>
12+
<a href="https://scrutinizer-ci.com/g/laravel-validation-rules/us-state">
13+
<img src="https://img.shields.io/scrutinizer/g/laravel-validation-rules/us-state.svg?style=flat-square">
14+
</a>
15+
<a href="https://github.com/laravel-validation-rules/us-state/blob/master/LICENSE">
16+
<img src="https://img.shields.io/github/license/laravel-validation-rules/us-state.svg?style=flat-square">
17+
</a>
18+
<a href="https://twitter.com/tylercd100">
19+
<img src="http://img.shields.io/badge/[email protected]?style=flat-square">
20+
</a>
21+
</p>
822

923
## Installation
1024

11-
Install via [composer](https://getcomposer.org/) - In the terminal:
1225
```bash
13-
composer require laravel-validation-rules/state
14-
```
15-
16-
Now add the following to the `providers` array in your `config/app.php`
17-
```php
18-
LVR\State\ServiceProvider::class
26+
composer require laravel-validation-rules/us-state
1927
```
2028

2129
## Usage
2230

2331
```php
24-
# USA vs Canada
25-
Validator::make(['test' => 'UT'], ['test' => 'state']); //true
26-
Validator::make(['test' => 'UT'], ['test' => 'state:usa']); //true
27-
Validator::make(['test' => 'BC'], ['test' => 'state:canada']); //true
32+
use LVR\State\Abbr;
33+
use LVR\State\Full;
2834

2935
# Abbreviation vs Full
30-
Validator::make(['test' => 'Utah'], ['test' => 'state:full']); //true
31-
Validator::make(['test' => 'UT'], ['test' => 'state:abbr']); //true
32-
33-
# Mix and match
34-
Validator::make(['test' => 'UT'], ['test' => 'state:usa,abbr']); //true
35-
Validator::make(['test' => 'Alberta'], ['test' => 'state:canada,full']); //true
36-
36+
$request->validate(['test' => 'UT'], ['test' => new Abbr]); // Pass!
37+
$request->validate(['test' => 'BC'], ['test' => new Abbr); // Pass!
38+
$request->validate(['test' => 'Utah'], ['test' => new Full]); // Pass!
39+
$request->validate(['test' => 'Alberta'], ['test' => new Full]); // Pass!
40+
41+
# Abbreviation - USA vs Canada
42+
$request->validate(['test' => 'UT'], ['test' => new Abbr]); // Pass!
43+
$request->validate(['test' => 'UT'], ['test' => new Abbr('US')]); // Pass!
44+
$request->validate(['test' => 'BC'], ['test' => new Abbr('CA')); // Pass!
45+
46+
# Full - USA vs Canada
47+
$request->validate(['test' => 'Utah'], ['test' => new Full('US')]); // Pass!
48+
$request->validate(['test' => 'Alberta'], ['test' => new Full('CA')]); // Pass!
3749
```
38-

‎composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "laravel-validation-rules/us-state",
3-
"description": "Validate strings that contain states and provinces for US and Canada",
3+
"description": "Validate US States and Canada Provinces",
44
"keywords": [
55
"laravel",
66
"validator",
77
"phone",
88
"tylercd100"
99
],
1010
"homepage": "https://github.com/laravel-validation-rules/us-state",
11-
"license": "MIT",
11+
"license": "Apache-2.0",
1212
"authors": [
1313
{
1414
"name": "Tyler Arbon",
@@ -27,13 +27,13 @@
2727
},
2828
"minimum-stability": "stable",
2929
"require": {
30-
"illuminate/validation": "^5.0",
31-
"illuminate/support": "^5.0",
32-
"php": "^5.5.9|^7.0"
30+
"illuminate/contracts": "^5.5",
31+
"illuminate/support": "^5.5",
32+
"php": "^7.0"
3333
},
3434
"require-dev": {
35-
"phpunit/phpunit": "^4.8|^5.0",
36-
"orchestra/testbench": "^3.2"
35+
"phpunit/phpunit": "^6.3",
36+
"orchestra/testbench": "^3.5"
3737
},
3838
"suggest": {
3939
}

‎phpunit.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
processIsolation="false"
1111
stopOnFailure="false">
1212
<testsuites>
13-
<testsuite name="Zenapply Test Suite">
13+
<testsuite name="Test Suite">
1414
<directory>tests/</directory>
1515
</testsuite>
1616
</testsuites>

‎src/Abbr.php

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?php
2+
3+
namespace LVR\State;
4+
5+
class Abbr extends Base
6+
{
7+
/**
8+
* Determine if the validation rule passes.
9+
*
10+
* @param string $attribute
11+
* @param mixed $value
12+
* @return bool
13+
*/
14+
public function passes($attribute, $value)
15+
{
16+
return $this->isAbbr($value, $this->country);
17+
}
18+
19+
/**
20+
* Get the validation error message.
21+
*
22+
* @return string
23+
*/
24+
public function message()
25+
{
26+
return ":attribute must be an abbreviated {$this->subject}";
27+
}
28+
}

0 commit comments

Comments
 (0)