Merge branch 'egulias:4.x' into 4.x

Author: caricare2

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "composer" 
+    directory: "/" 
+    schedule:
+      interval: "weekly"

.github/workflows/static-analysis.yml

@@ -3,7 +3,6 @@ name: static analysis
 on:
   push:
     branches:
-      - master
       - '*.x'
   pull_request:
 

.github/workflows/tests.yml

@@ -1,13 +1,10 @@
-name: build
+name: unit-tests
 
 on:
   push:
     branches:
-      - master
       - '*.x'
   pull_request:
-  schedule:
-    - cron: '0 0 * * *'
 
 jobs:
   tests:
@@ -47,15 +44,10 @@ jobs:
 
       - name: Execute tests
         run: vendor/bin/phpunit --coverage-clover build/logs/clover.xml --exclude-group flaky
-      - name: Coverage
-        if: ${{ matrix.php == '8.1' && matrix.deps == 'lowest' }}
-        shell: bash
-        env:
-            CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
-        run: bash <(curl -Ls https://coverage.codacy.com/get.sh) report -r build/logs/clover.xml
 
       - name: Store artifacts
+        if: ${{ matrix.php == '8.1' && matrix.deps == 'lowest' }}
         uses: actions/upload-artifact@v4
         with:
-          name: logs
-          path: build/logs      
+          name: clover.xml
+          path: build/logs

.github/workflows/upload-to-codacy.yml

@@ -0,0 +1,33 @@
+name: upload-coverage-to-codacy
+on:
+  workflow_run:
+    workflows: ["unit-tests"]
+    types:
+      - completed
+
+jobs:
+  upload:
+    runs-on: ubuntu-latest
+    if: >
+      github.event.workflow_run.event == 'pull_request' &&
+      github.event.workflow_run.conclusion == 'success'
+    strategy:
+      fail-fast: true
+    name: upload-coverage
+    
+    steps:
+      - name: Setup logs directory
+        run: mkdir -p build/coverage
+
+      - name: Download clover.xml artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: clover.xml
+          path: build/coverage
+
+      - name: Upload Coverage to Codacy
+        shell: bash
+        env:
+          CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
+
+        run: bash <(curl -Ls https://coverage.codacy.com/get.sh) report -r build/coverage/clover.xml

CHANGELOG.md

@@ -3,39 +3,44 @@
 [![Build Status](https://github.com/egulias/EmailValidator/actions/workflows/tests.yml/badge.svg)](https://github.com/egulias/EmailValidator/actions/workflows/tests.yml)
 [![Quality Badge](https://app.codacy.com/project/badge/Grade/55d44898c7e44ebdb4e457523563ad63)](https://app.codacy.com/gh/egulias/EmailValidator/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 [![Test Coverage](https://app.codacy.com/project/badge/Coverage/55d44898c7e44ebdb4e457523563ad63)](https://app.codacy.com/gh/egulias/EmailValidator/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_coverage)
+![Latest Release](https://img.shields.io/github/v/release/egulias/EmailValidator)
 
 A library for validating emails against several RFC.
 
 ## Supported RFCs
 
 This library aims to support RFCs:
 
-* [5321](https://tools.ietf.org/html/rfc5321), 
-* [5322](https://tools.ietf.org/html/rfc5322), 
-* [6530](https://tools.ietf.org/html/rfc6530), 
-* [6531](https://tools.ietf.org/html/rfc6531), 
+* [5321](https://tools.ietf.org/html/rfc5321),
+* [5322](https://tools.ietf.org/html/rfc5322),
+* [6530](https://tools.ietf.org/html/rfc6530),
+* [6531](https://tools.ietf.org/html/rfc6531),
 * [6532](https://tools.ietf.org/html/rfc6532),
 * [1035](https://tools.ietf.org/html/rfc1035) 
 
 ## Supported versions
 
-**Current major version with full support is v3**
-
 | Version |  Released  | EOL | Only critical bug fixes | Full |
 |:-------:|:----------:|:---:|:-----------------------:|:----:|
-|  v4.x   | 2023/01/07 |  -  |            X            |  X   |
-|  v3.x   | 2020/12/29 |  -  |            X            |      |
+|**v4.x** |**2023/01/07** |  -  |            **X**        |**X** |
+|  v3.x   | 2020/12/29 | YES |                         |      |
 | v2.1.x  | 2016/05/16 | YES |                         |      |
 |  v1.2   | 2013/19/05 | YES |                         |      |
 
-
 ## Requirements
 
- * PHP 8.1
- * [Composer](https://getcomposer.org) is required for installation
- * [Spoofchecking](/src/Validation/Extra/SpoofCheckValidation.php) and [DNSCheckValidation](/src/Validation/DNSCheckValidation.php) validation requires that your PHP system has the [PHP Internationalization Libraries](https://php.net/manual/en/book.intl.php) (also known as PHP Intl)
+* PHP 8.1
+* [Composer](https://getcomposer.org) is required for installation
+* [Spoofchecking](/src/Validation/Extra/SpoofCheckValidation.php) and
+[DNSCheckValidation](/src/Validation/DNSCheckValidation.php) validation
+requires that your PHP system has the
+[PHP Internationalization Libraries](https://php.net/manual/en/book.intl.php) 
+(also known as PHP Intl)
 
-**Note**: `PHP version upgrades will happen to accomodate to the pace of major frameworks. Minor versions bumps will go via minor versions of this library (i.e: PHP7.3 -> v3.x+1). Major versions will go with major versions of the library`
+**Note**: `PHP version upgrades will happen to accomodate to the pace of major
+frameworks. Minor versions bumps will go via minor versions of this library
+(i.e: PHP7.3 -> v3.x+1). Major versions will go with major versions
+of the library`
 
 ## Installation
 
@@ -47,9 +52,12 @@ composer require egulias/email-validator
 
 ## Getting Started
 
-`EmailValidator` requires you to decide which (or combination of them) validation/s strategy/ies you'd like to follow for each [validation](#available-validations).
+`EmailValidator` requires you to decide which (or combination of them)
+validation/s strategy/ies you'd like to follow for each
+[validation](#available-validations).
 
 A basic example with the RFC validation
+
 ```php
 <?php
 
@@ -60,17 +68,22 @@ $validator = new EmailValidator();
 $validator->isValid("[email protected]", new RFCValidation()); //true
 ```
 
-
 ### Available validations
 
 1. [RFCValidation](/src/Validation/RFCValidation.php): Standard RFC-like email validation.
-2. [NoRFCWarningsValidation](/src/Validation/NoRFCWarningsValidation.php): RFC-like validation that will fail when warnings* are found.
-3. [DNSCheckValidation](/src/Validation/DNSCheckValidation.php): Will check if there are DNS records that signal that the server accepts emails. This does not entail that the email exists.
-4. [MultipleValidationWithAnd](/src/Validation/MultipleValidationWithAnd.php): It is a validation that operates over other validations performing a logical and (&&) over the result of each validation.
-5. [MessageIDValidation](/src/Validation/MessageIDValidation.php): Follows [RFC2822 for message-id](https://tools.ietf.org/html/rfc2822#section-3.6.4) to validate that field, that has some differences in the domain part.
-6. [Your own validation](#how-to-extend): You can extend the library behaviour by implementing your own validations.
-
-*warnings: Warnings are deviations from the RFC that in a broader interpretation are accepted.
+2. [NoRFCWarningsValidation](/src/Validation/NoRFCWarningsValidation.php):
+RFC-like validation that will fail when warnings* are found.
+3. [DNSCheckValidation](/src/Validation/DNSCheckValidation.php):
+Will check if there are DNS records that signal that the server accepts emails. This does not entail that the email exists.
+4. [MultipleValidationWithAnd](/src/Validation/MultipleValidationWithAnd.php):
+It is a validation that operates over other validations performing a logical and (&&) over the result of each validation.
+5. [MessageIDValidation](/src/Validation/MessageIDValidation.php):
+Follows [RFC2822 for message-id](https://tools.ietf.org/html/rfc2822#section-3.6.4) to validate that field, that has some differences in the domain part.
+6. [Your own validation](#how-to-extend): You can extend the library behaviour
+by implementing your own validations.
+
+*warnings: Warnings are deviations from the RFC that in a broader interpretation
+are accepted.
 
 ```php
 <?php
@@ -90,29 +103,38 @@ $validator->isValid("[email protected]", $multipleValidations); //true
 ```
 
 #### Additional validations
-Validations not present in the RFCs 
 
-1. [SpoofCheckValidation](/src/Validation/Extra/SpoofCheckValidation.php): Will check for multi-utf-8 chars that can signal an erroneous email name.
+Validations not present in the RFCs
+
+1. [SpoofCheckValidation](/src/Validation/Extra/SpoofCheckValidation.php): 
+Will check for multi-utf-8 chars that can signal an erroneous email name.
 
 
 ### How to extend
 
-It's easy! You just need to implement [EmailValidation](/src/Validation/EmailValidation.php) and you can use your own validation.
+It's easy! You just need to implement
+[EmailValidation](/src/Validation/EmailValidation.php) and you can use your own
+validation.
 
 ## Contributing
 
-Please follow the [Contribution guide](CONTRIBUTING.md). Is short and simple and will help a lot.
+Please follow the [Contribution guide](CONTRIBUTING.md).
+Is short and simple and will help a lot.
 
 ## Other Contributors
 
-(You can find current contributors [here](https://github.com/egulias/EmailValidator/graphs/contributors))
+(You can find current contributors
+[here](https://github.com/egulias/EmailValidator/graphs/contributors))
 
 As this is a port from another library and work, here are other people related to the previous one:
 
-* Ricard Clau [@ricardclau](https://github.com/ricardclau):      	Performance against PHP built-in filter_var (v2 and earlier)
-* Josepf Bielawski [@stloyd](https://github.com/stloyd):      		For its first re-work of Dominic's lib
-* Dominic Sayers [@dominicsayers](https://github.com/dominicsayers):  	The original isemail function
+* Ricard Clau [@ricardclau](https://github.com/ricardclau):
+Performance against PHP built-in filter_var (v2 and earlier)
+* Josepf Bielawski [@stloyd](https://github.com/stloyd):
+For its first re-work of Dominic's lib
+* Dominic Sayers [@dominicsayers](https://github.com/dominicsayers):
+The original `isemail` function
 
 ## License
 
-Released under the MIT License attached with this code.
+Released under the MIT License attached with this code.

README.md

@@ -150,6 +150,8 @@ public static function getInvalidEmails()
             ['\r\n \r\n [email protected]'],
             ['test;[email protected]'],
             ['examp║[email protected]'],
+            ['[email protected]'],
+            ['[email protected]'],
             ['0'],
             [0],
         ];