Skip to content

Commit c0ef84e

Browse files
authored
Merge pull request #29 from articstudio/develop
Release v1.1.0
2 parents ac535cd + a378b25 commit c0ef84e

File tree

10 files changed

+256
-671
lines changed

10 files changed

+256
-671
lines changed

.circleci/config.yml

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ executors:
1919
docker:
2020
- image: php:7.2
2121
working_directory: ~/repo_php_7_2
22+
"php-7-3":
23+
docker:
24+
- image: php:7.3
25+
working_directory: ~/repo_php_7_3
2226

2327
aliases:
2428
- &composer_7_1_cache_key
@@ -29,6 +33,10 @@ aliases:
2933
composer-7.2-{{ checksum "composer.lock" }}
3034
- &wd_7_2
3135
~/repo_php_7_2
36+
- &composer_7_3_cache_key
37+
composer-7.3-{{ checksum "composer.lock" }}
38+
- &wd_7_3
39+
~/repo_php_7_3
3240
- &ignore_non_dev_branches
3341
filters:
3442
tags:
@@ -92,15 +100,40 @@ jobs:
92100
at: *wd_7_2
93101
- run: php ./bin/phpbin php:lint
94102

103+
prepare_7_3:
104+
executor: "php-7-3"
105+
steps:
106+
- checkout
107+
- "system-dependencies"
108+
- restore_cache:
109+
key: *composer_7_3_cache_key
110+
- run: composer install --no-progress
111+
- save_cache:
112+
key: *composer_7_3_cache_key
113+
paths:
114+
- vendor/
115+
- persist_to_workspace:
116+
root: *wd_7_3
117+
paths:
118+
- ./*
119+
120+
test_7_3:
121+
executor: "php-7-3"
122+
steps:
123+
- checkout
124+
- "system-dependencies"
125+
- attach_workspace:
126+
at: *wd_7_3
127+
- run: php ./bin/phpbin php:lint
128+
95129
code_checks:
96-
executor: "php-7-2"
130+
executor: "php-7-1"
97131
steps:
98132
- checkout
99133
- "system-dependencies"
100134
- attach_workspace:
101-
at: *wd_7_2
102-
- run: php ./bin/phpbin php:psr1
103-
- run: php ./bin/phpbin php:psr2
135+
at: *wd_7_1
136+
- run: php ./bin/phpbin php:style
104137
- run: php ./bin/phpbin php:metrics
105138
- store_artifacts:
106139
path: build/metrics
@@ -124,11 +157,17 @@ workflows:
124157
requires:
125158
- prepare_7_2
126159
<<: *ignore_non_dev_branches
160+
- prepare_7_3:
161+
<<: *ignore_non_dev_branches
162+
- test_7_3:
163+
requires:
164+
- prepare_7_3
165+
<<: *ignore_non_dev_branches
127166
code_quality:
128167
jobs:
129-
- prepare_7_2:
168+
- prepare_7_1:
130169
<<: *ignore_non_dev_branches
131170
- code_checks:
132171
requires:
133-
- prepare_7_2
172+
- prepare_7_1
134173
<<: *ignore_non_dev_branches

.phpcs.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<ruleset name="PHP_CodeSniffer" xsi:noNamespaceSchemaLocation="phpcs.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2+
<description>The coding standard for PHP_CodeSniffer itself.</description>
3+
4+
<file>bin</file>
5+
<file>src</file>
6+
7+
<exclude-pattern>.circleci/</exclude-pattern>
8+
<exclude-pattern>build/</exclude-pattern>
9+
<exclude-pattern>test/</exclude-pattern>
10+
<exclude-pattern>vendor/</exclude-pattern>
11+
12+
<arg name="basepath" value="."/>
13+
<arg name="colors"/>
14+
<arg name="parallel" value="75"/>
15+
<arg value="p"/>
16+
<ini name="memory_limit" value="128M"/>
17+
18+
<rule ref="Internal.Tokenizer.Exception">
19+
<type>error</type>
20+
</rule>
21+
22+
<rule ref="PSR2"/>
23+
<rule ref="PSR1"/>
24+
</ruleset>

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4+
## [1.1.0] - 2019-04-07
5+
6+
### Added
7+
- Add PHP style from config file
8+
### Fixed
9+
- Fix & update composer.json
10+
- Fix dev packages replace self.version
11+
412
## [1.0.7] - 2019-02-22
513

614
### Fixed
@@ -52,6 +60,7 @@ All notable changes to this project will be documented in this file.
5260
- PHP
5361

5462

63+
[1.1.0]: https://github.com/articstudio/php-bin/releases/tag/1.1.0
5564
[1.0.7]: https://github.com/articstudio/php-bin/releases/tag/1.0.7
5665
[1.0.6]: https://github.com/articstudio/php-bin/releases/tag/1.0.6
5766
[1.0.5]: https://github.com/articstudio/php-bin/releases/tag/1.0.5

composer.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"type": "library",
44
"description": "",
55
"keywords": [
6-
"partio",
7-
"lingvo"
6+
"php",
7+
"bin"
88
],
99
"homepage": "https://github.com/articstudio/php-bin",
1010
"authors": [
@@ -25,10 +25,7 @@
2525
"symfony/console": "^4.2",
2626
"symfony/process": "^4.2"
2727
},
28-
"require-dev": {
29-
"illuminate/database": "5.7.*",
30-
"psr/log": "^1.1"
31-
},
28+
"require-dev": {},
3229
"config": {
3330
"optimize-autoloader": true,
3431
"preferred-install": "dist",
@@ -65,5 +62,6 @@
6562
},
6663
"bin": [
6764
"bin/phpbin"
68-
]
69-
}
65+
],
66+
"replace": {}
67+
}

0 commit comments

Comments
 (0)