Skip to content
This repository has been archived by the owner on Dec 11, 2020. It is now read-only.

add chinese bank account #2023

Open
wants to merge 82 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
d4d837e
Fix: Require PHP 7.2 (#1846)
localheinz Nov 14, 2019
5e086da
Enhancement: Echo a greeting (#1858)
localheinz Nov 28, 2019
d7b25e0
Enhancement: Switch to using GitHub actions (#1847)
localheinz Dec 2, 2019
386663d
Fix: Invoke composer directly
localheinz Jan 13, 2020
3580632
Fix: Configure preferred installation method via composer.json
localheinz Jan 13, 2020
005b3fd
Merge pull request #1892 from localheinz/fix/which
localheinz Mar 11, 2020
ad7afd9
Merge pull request #1893 from localheinz/fix/prefer-dist
localheinz Mar 11, 2020
b7538a8
Enhancement: Update squizlabs/php_codesniffer
localheinz Jan 13, 2020
8f559f5
Fix: Run 'make fix'
localheinz Mar 11, 2020
0843aca
Merge pull request #1895 from localheinz/feature/phpcs
localheinz Mar 11, 2020
da215ee
Enhancement: Require phpunit/phpunit:^8.5.2 (#1890)
localheinz Mar 11, 2020
4363bb7
Removed legacy autoloader
pimjansen Feb 2, 2020
d81092c
Merge pull request #1911 from pimjansen/feature/removed-legacy-autolo…
localheinz Mar 11, 2020
2c94f6a
Fix: Reduce visibility (#1889)
localheinz Mar 11, 2020
ba9a5fd
Enhancement: Use XML configuration for squizlabs/php_codesniffer (#1896)
localheinz Mar 11, 2020
4da5af3
Enhancement: Add note about 'Keep a Changelog' (#1953)
localheinz Mar 11, 2020
6283e74
Fix: Use extensions key instead of deprecated extension-csv (#1898)
localheinz Mar 11, 2020
afdf898
Fix: Show build status for next branch (#1955)
localheinz Mar 11, 2020
f97d06b
Removed all the ORM/ODM integrations from the core
pimjansen Mar 11, 2020
abb7632
Merge pull request #1957 from pimjansen/feature/removed-orm-integrations
localheinz Mar 11, 2020
fa98ec9
Enhancement: Collect code coverage using pcov (#1958)
localheinz Mar 11, 2020
b1a5b96
Enhancement: Synchronize workflow (#1959)
localheinz Mar 12, 2020
33df91c
Remove deprecated curly braces
divine Mar 13, 2020
d6548e2
Merge pull request #1961 from divine/fix_curly_braces
localheinz Mar 13, 2020
3d561a4
Project specific files
pimjansen Mar 11, 2020
59eff8a
Fix: Alias
localheinz Mar 13, 2020
d1e86a3
Merge pull request #1956 from pimjansen/feature/project-files
localheinz Mar 13, 2020
2a190e1
Enhancement: Add type and return type declarations to Generator (#1894)
localheinz Mar 15, 2020
8e05aa2
Enhancement: Run a static code analysis and collect type coverage wit…
localheinz Mar 15, 2020
3b1cb90
Fix: Update composer.lock (#1963)
localheinz Mar 15, 2020
1fe9347
Migrated Faker to match PSR12 instead of PSR2
pimjansen Mar 15, 2020
a88ae83
Merge pull request #1962 from pimjansen/feature/psr12
localheinz Mar 15, 2020
967a6c8
Enhancement: Require error level 7 (#1964)
localheinz Mar 15, 2020
67f1027
Fix: Require test code to follow our coding standard as well
localheinz Mar 15, 2020
52c97b2
Fix: Run 'make fix'
localheinz Mar 15, 2020
a9ff51d
Fix: Manually fix issues that phpcbf cannot fix
localheinz Mar 15, 2020
781069d
Merge pull request #1966 from localheinz/fix/test
localheinz Mar 15, 2020
e46b3db
Enhancement: Show progress when running phpcbf or phpcs (#1967)
localheinz Mar 15, 2020
4ed46e2
Enhancement: Enable DisallowLongArraySyntax rule
localheinz Mar 15, 2020
c22f14a
Fix: Run 'make fix'
localheinz Mar 15, 2020
86c1687
Merge pull request #1968 from localheinz/feature/disallow-long-array-…
localheinz Mar 15, 2020
ed970d3
Enhancement: Reference schema for phpcs configuration (#1969)
localheinz Mar 15, 2020
2ad7f91
Enhancement: Use cache for squizlabs/php_codesniffer (#1970)
localheinz Mar 15, 2020
10148f6
Enhancement: Require slevomat/coding-standard
localheinz Mar 15, 2020
b71cc52
Enhancement: Require dealerdirect/phpcodesniffer-composer-installer
localheinz Mar 15, 2020
4218e07
Enhancement: Enable AlphabeticallySortedUses rule
localheinz Mar 15, 2020
a223104
Fix: Run 'make fix'
localheinz Mar 15, 2020
6a9f92a
Enhancement: Use colors when running phpcbf or phpcs
localheinz Mar 15, 2020
709286f
Merge pull request #1972 from localheinz/feature/colors
fzaninotto Apr 9, 2020
c956e03
Merge pull request #1971 from localheinz/feature/alphabetically-sorte…
fzaninotto Apr 9, 2020
408ea04
Enhancement: Update actions/checkout
localheinz Oct 22, 2020
4880f4d
Enhancement: Update actions/cache
localheinz Oct 22, 2020
2fe97fc
Fix: Update phpunit/phpunit
localheinz Oct 22, 2020
b3edb95
Add countryISOAlpha3 to documentation (#2032)
antoinelame Oct 23, 2020
4784955
Replace latin 'a' letter to cyrillic 'а' letter (#2018)
ezoterik Oct 23, 2020
dbba8fe
Merge pull request #2073 from localheinz/feature/checkout
fzaninotto Oct 23, 2020
6d08ad8
Merge pull request #2074 from localheinz/feature/cache
fzaninotto Oct 23, 2020
a4a6420
Merge pull request #2075 from localheinz/fix/phpunit
fzaninotto Oct 23, 2020
e251f57
Fix: Update squizlabs/php_codesniffer
localheinz Oct 23, 2020
0d27af5
Fix: Run 'make coding-standards'
localheinz Oct 23, 2020
ad17432
Fix: Failing test related to cyrillic a
localheinz Oct 23, 2020
c0c661e
Merge pull request #2076 from localheinz/fix/php-codesniffer
localheinz Oct 23, 2020
69bafc5
Enhancement: Raise error level from 7 to 6
localheinz May 10, 2020
3b7c204
Fix: Declare fields otherwise declared dynamically
localheinz May 10, 2020
bd1b776
Fix: Use assertEquals() instead of assertEqual()
localheinz Oct 22, 2020
8e22dd7
Fix: DocBlock
localheinz Oct 22, 2020
814e987
Fix: Cast value to string before accessing its characters
localheinz Oct 22, 2020
db9fc37
Fix: Use str_split() instead of undefined static method split()
localheinz Oct 22, 2020
97ce575
Fix: Remove method that depends on undefined static property
localheinz Oct 22, 2020
a0d1a50
Fix: Regenerate baseline
localheinz Oct 22, 2020
7f3a1b8
Merge pull request #1965 from localheinz/feature/error-level-6
localheinz Oct 23, 2020
6915943
Enhancement: Add configuration for Dependabot (#2078)
localheinz Oct 23, 2020
5c9b591
Enhancement: Raise error level from 6 to 5 (#2082)
localheinz Oct 23, 2020
78fc881
Enhancement: Update vimeo/psalm (#2072)
localheinz Oct 23, 2020
937ea4c
Enhancement: Update dealerdirect/phpcodesniffer-composer-installer
localheinz Oct 23, 2020
8f7a17f
Merge pull request #2080 from localheinz/feature/phpcodesniffer-compo…
localheinz Oct 23, 2020
67ea784
Enhancement: Update slevomat/coding-standard (#2081)
localheinz Oct 23, 2020
9104770
Enhancement: Enable UnusedUses rule (#2086)
localheinz Oct 23, 2020
503ee3d
Fix: Remove psalm/plugin-phpunit (#2087)
localheinz Oct 23, 2020
eb0a6d4
Enhancement: Use vimeo/psalm as PHAR (#2088)
localheinz Oct 23, 2020
b4af9b3
Fix: PHP requirement in README.md
localheinz Oct 23, 2020
a5f954a
Merge pull request #2089 from localheinz/fix/php
fzaninotto Oct 23, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
24 changes: 24 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# https://editorconfig.org/

root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
tab_width = 4
trim_trailing_whitespace = true

[*.patch]
trim_trailing_whitespace = false

[*.yml]
indent_size = 2

[COMMIT_EDITMSG]
max_line_length = 80

[Makefile]
indent_style = tab
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
/.github/ export-ignore
/.phive/ export-ignore
/test/ export-ignore
/.editorconfig export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/CONTRIBUTING.md export-ignore
/Makefile export-ignore
/phpcs.xml export-ignore
/phpunit.xml.dist export-ignore
/psalm-baseline.xml export-ignore
/psalm.xml export-ignore
29 changes: 29 additions & 0 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2

updates:
- commit-message:
include: "scope"
prefix: "composer"
directory: "/"
labels:
- "dependency"
open-pull-requests-limit: 10
package-ecosystem: "composer"
schedule:
interval: "daily"
target-branch: "next"
versioning-strategy: "increase"

- commit-message:
include: "scope"
prefix: "github-actions"
directory: "/"
labels:
- "dependency"
open-pull-requests-limit: 10
package-ecosystem: "github-actions"
schedule:
interval: "daily"
target-branch: "next"
188 changes: 188 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
# https://help.github.com/en/categories/automating-your-workflow-with-github-actions

on:
pull_request:
push:
branches:
- "master"
- "next"
tags:
- "**"

name: "Continuous Integration"

jobs:
coding-standards:
name: "Coding Standards"

runs-on: "ubuntu-latest"

strategy:
matrix:
php-version:
- "7.2"

steps:
- name: "Checkout"
uses: "actions/checkout@v2"

- name: "Install PHP with extensions"
uses: "shivammathur/setup-php@v2"
with:
coverage: "none"
extensions: "intl"
php-version: "${{ matrix.php-version }}"

- name: "Determine composer cache directory"
id: "determine-composer-cache-directory"
run: "echo \"::set-output name=directory::$(composer config cache-dir)\""

- name: "Validate composer.json and composer.lock"
run: "composer validate --strict"

- name: "Cache dependencies installed with composer"
uses: "actions/cache@v2"
with:
path: "${{ steps.determine-composer-cache-directory.outputs.directory }}"
key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-"

- name: "Install locked dependencies from composer.lock"
run: "composer install --no-interaction --no-progress --no-suggest"

- name: "Create cache directory for squizlabs/php_codesniffer"
run: "mkdir -p .build/php-codesniffer"

- name: "Cache cache directory for squizlabs/php_codesniffer"
uses: "actions/cache@v2"
with:
path: ".build/php-codesniffer/"
key: "php-${{ matrix.php-version }}-php-codesniffer-${{ hashFiles('**/composer.json') }}"
restore-keys: "php-${{ matrix.php-version }}-php-codesniffer-"

- name: "Run squizlabs/php_codesniffer"
run: "vendor/bin/phpcs --cache=.build/php-codesniffer/cache.json"

static-code-analysis:
name: "Static Code Analysis"

runs-on: "ubuntu-latest"

strategy:
matrix:
php-version:
- "7.4"

steps:
- name: "Checkout"
uses: "actions/checkout@v2"

- name: "Install PHP with extensions"
uses: "shivammathur/setup-php@v2"
with:
coverage: "none"
extensions: "intl"
php-version: "${{ matrix.php-version }}"

- name: "Determine composer cache directory"
id: "determine-composer-cache-directory"
run: "echo \"::set-output name=directory::$(composer config cache-dir)\""

- name: "Cache dependencies installed with composer"
uses: "actions/cache@v2"
with:
path: "${{ steps.determine-composer-cache-directory.outputs.directory }}"
key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-"

- name: "Install dependencies with composer"
run: "composer install --no-interaction --no-progress --no-suggest"

- name: "Run vimeo/psalm"
run: ".phive/psalm --config=psalm.xml --shepherd --show-info=false --stats"

tests:
name: "Tests"

runs-on: "ubuntu-latest"

strategy:
matrix:
php-version:
- "7.2"
- "7.3"
- "7.4"

steps:
- name: "Checkout"
uses: "actions/checkout@v2"

- name: "Install PHP with extensions"
uses: "shivammathur/setup-php@v2"
with:
coverage: "none"
extensions: "intl"
php-version: "${{ matrix.php-version }}"

- name: "Determine composer cache directory"
id: "determine-composer-cache-directory"
run: "echo \"::set-output name=directory::$(composer config cache-dir)\""

- name: "Cache dependencies installed with composer"
uses: "actions/cache@v2"
with:
path: "${{ steps.determine-composer-cache-directory.outputs.directory }}"
key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-"

- name: "Install locked dependencies from composer.lock"
run: "composer install --no-interaction --no-progress --no-suggest"

- name: "Run tests with phpunit/phpunit"
run: "vendor/bin/phpunit"

code-coverage:
name: "Code Coverage"

runs-on: "ubuntu-latest"

strategy:
matrix:
php-version:
- "7.4"

steps:
- name: "Checkout"
uses: "actions/checkout@v2"

- name: "Install PHP with extensions"
uses: "shivammathur/setup-php@v2"
with:
coverage: "pcov"
extensions: "intl"
php-version: "${{ matrix.php-version }}"

- name: "Determine composer cache directory"
id: "determine-composer-cache-directory"
run: "echo \"::set-output name=directory::$(composer config cache-dir)\""

- name: "Cache dependencies installed with composer"
uses: "actions/cache@v2"
with:
path: "${{ steps.determine-composer-cache-directory.outputs.directory }}"
key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-"

- name: "Install locked dependencies from composer.lock"
run: "composer install --no-interaction --no-progress --no-suggest"

- name: "Create build directory"
run: "mkdir -p .build/logs"

- name: "Collect code coverage with pcov and phpunit/phpunit"
run: "vendor/bin/phpunit --coverage-clover=.build/logs/clover.xml"

- name: "Send code coverage report to Codecov.io"
env:
CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"
run: "bash <(curl -s https://codecov.io/bash)"
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
vendor
composer.lock
/.build/
/vendor/
4 changes: 4 additions & 0 deletions .phive/phars.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="psalm" version="3.18.2" installed="3.18.2" location="./.phive/psalm" copy="true"/>
</phive>
Binary file added .phive/psalm
Binary file not shown.
30 changes: 0 additions & 30 deletions .travis.yml

This file was deleted.

12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
# CHANGELOG

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## TDB, v2.0.0

### Removed

- Removed legacy autoloader [\#1911](https://github.com/fzaninotto/Faker/pull/1911) ([pimjansen](https://github.com/pimjansen))
- Removed ORM and ODM integrations [\#1957](https://github.com/fzaninotto/Faker/pull/1957) ([pimjansen](https://github.com/pimjansen))

## 2019-11-10, v1.9.0

This will the last minor release in the `1.x` cycle.
This will the last minor release in the `1.x` cycle.

- Add all Iran's provinces land lines numbers [\#1806](https://github.com/fzaninotto/Faker/pull/1806) ([kingofnull](https://github.com/kingofnull))
- replace latin "B" to cyrillic "B" for uk\_UA locale [\#1800](https://github.com/fzaninotto/Faker/pull/1800) ([FI-LIFE](https://github.com/FI-LIFE))
Expand Down
15 changes: 11 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
.PHONY: build fix help sniff test
.PHONY: build fix help sniff static-code-analysis static-code-analysis-baseline test

help:
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

build: fix test ## Runs fix and test targets

fix: vendor/autoload.php ## Fixes code style issues with phpcbf
vendor/bin/phpcbf --standard=PSR2 src
vendor/bin/phpcbf

sniff: vendor/autoload.php ## Detects code style issues with phpcs
vendor/bin/phpcs --standard=PSR2 src -n
mkdir -p .build/php-codesniffer
vendor/bin/phpcs --cache=.build/php-codesniffer/cache.json

static-code-analysis: vendor ## Runs a static code analysis with vimeo/psalm
.phive/bin/psalm --config=psalm.xml --show-info=false --stats

static-code-analysis-baseline: vendor ## Generates a baseline for static code analysis with vimeo/psalm
.phive/bin/psalm --config=psalm.xml --set-baseline=psalm-baseline.xml

test: vendor/autoload.php ## Runs tests with phpunit
vendor/bin/phpunit --verbose

vendor/autoload.php:
composer install --no-interaction --prefer-dist
composer install --no-interaction
21 changes: 16 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,24 @@
"authors": [
{
"name": "François Zaninotto"
},
{
"name": "Andreas Möller",
"email": "[email protected]"
},
{
"name": "Pim Jansen"
}
],
"require": {
"php": "^5.3.3 || ^7.0"
"php": "^7.2"
},
"require-dev": {
"ext-intl": "*",
"phpunit/phpunit": "^4.8.35 || ^5.7",
"squizlabs/php_codesniffer": "^2.9.2"
"dealerdirect/phpcodesniffer-composer-installer": "~0.7.0",
"phpunit/phpunit": "^8.5.8",
"slevomat/coding-standard": "^6.4.1",
"squizlabs/php_codesniffer": "^3.5.8"
},
"autoload": {
"psr-4": {
Expand All @@ -28,15 +37,17 @@
},
"autoload-dev": {
"psr-4": {
"Faker\\Test\\": "test/Faker/"
"Faker\\Test\\": "test/Faker/",
"Faker\\Test\\Fixture\\": "test/Fixture/"
}
},
"extra": {
"branch-alias": {
"dev-master": "1.9"
"dev-master": "1.9-dev"
}
},
"config": {
"preferred-install": "dist",
"sort-packages": true
}
}
Loading