Skip to content

Commit 88af9d8

Browse files
authored
Merge pull request #538 from mike42/development
Changes for release 2.0
2 parents 995d9a7 + 82c4d41 commit 88af9d8

22 files changed

+630
-208
lines changed

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@ php:
1010
- 5.6
1111
- 7.0
1212
- 7.1
13+
- 7.2
1314
- nightly
15+
- hhvm-3.21
16+
- hhvm-nightly
1417

1518
matrix:
1619
allow_failures:
1720
- php: nightly
21+
- php: hhvm-nightly
1822

1923
before_install:
2024
- sudo apt-get -qq update
@@ -25,7 +29,7 @@ install:
2529

2630
before_script:
2731
# Install 'imagick' plugin
28-
- printf "\n" | pecl install imagick
32+
- bash -c 'if [[ $TRAVIS_PHP_VERSION != hhvm* ]]; then printf "\n" | pecl install imagick; fi'
2933
# Directory for coverage report
3034
- mkdir -p build/logs/
3135

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ This project uses the [PSR-2 standard](https://github.com/php-fig/fig-standards/
4242

4343
## Testing and CI
4444

45-
The tests are executed on [Travis CI](https://travis-ci.org/mike42/escpos-php) over PHP 5.3, 5.4, 5.5, 5.7, 7, and HHVM. Earlier versions of PHP are not supported.
45+
The tests are executed on [Travis CI](https://travis-ci.org/mike42/escpos-php) over PHP 5.4, 5.5, 5.6, 7.0, 7.1 and 7.2, plus the latest LTS version of HHVM, 3.21. Older versions of PHP are not supported in current releases.
4646

4747
For development, it's suggested that you load `imagick`, `gd` and `Xdebug` PHP exensions, and install `composer`.
4848

CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Main repository: [mike42/escpos-php](https://github.com/mike42/escpos-php) ([onl
1111
- [matiasgaston](https://github.com/matiasgaston)
1212
- [Mike Stivala](https://github.com/brndwgn)
1313
- [Nicholas Long](https://github.com/longsview)
14+
- [Evandro Araújo](https://github.com/evsar3)
1415

1516
Via fork: [wdoyle/EpsonESCPOS-PHP](https://github.com/wdoyle/EpsonESCPOS-PHP):
1617

README.md

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -67,30 +67,35 @@ This driver is known to work with the following OS/interface combinations:
6767
### Printers
6868
Many thermal receipt printers support ESC/POS to some degree. This driver has been known to work with:
6969

70+
- 3nStrat POS-08
7071
- AURES ODP-333
7172
- AURES ODP-500
73+
- Bematech-4200-TH
7274
- Bixolon SRP-350III
75+
- Black Copper BC-85AC
7376
- Citizen CBM1000-II
7477
- Citizen CT-S310II
78+
- Dapper-Geyi Q583P
7579
- Daruma DR800
7680
- EPOS TEP 220M
77-
- Epson TM-T88II
78-
- Epson TM-T88III
79-
- Epson TM-T88IV
80-
- Epson TM-T88V
81-
- Epson TM-T70
82-
- Epson TM-T82II
81+
- Epson EU-T332C
82+
- Epson FX-890 (requires `feedForm()` to release paper).
8383
- Epson TM-T20
8484
- Epson TM-T20II
85+
- Epson TM-T70
8586
- Epson TM-T70II
8687
- Epson TM-T81
88+
- Epson TM-T82II
89+
- Epson TM-T88II
90+
- Epson TM-T88III
91+
- Epson TM-T88IV
92+
- Epson TM-T88V
8793
- Epson TM-U220
8894
- Epson TM-U295 (requires `release()` to release slip).
8995
- Epson TM-U590 and TM-U590P
90-
- Epson FX-890 (requires `feedForm()` to release paper).
9196
- Equal (EQ-IT-001) POS-58
92-
- Excelvan HOP-E58
9397
- Excelvan HOP-E200
98+
- Excelvan HOP-E58
9499
- Excelvan HOP-E801
95100
- Excelvan ZJ-8220
96101
- Gainscha GP-5890x (Also marketed as EC Line 5890x)
@@ -100,28 +105,34 @@ Many thermal receipt printers support ESC/POS to some degree. This driver has be
100105
- Metapace T-1
101106
- Metapace T-25
102107
- Nexa PX700
108+
- Nyear NP100
103109
- Okipos 80 Plus III
104110
- Orient BTP-R580
105111
- P-822D
106112
- P85A-401 (make unknown)
107113
- Rongta RP326US
108114
- Rongta RP58-U
115+
- Senor TP-100
109116
- SEYPOS PRP-300 (Also marketed as TYSSO PRP-300)
117+
- Sicar POS-80
110118
- Silicon SP-201 / RP80USE
119+
- SPRT SP-POS88V
120+
- Star BSC10
111121
- Star TSP100 ECO
112122
- Star TSP100III FuturePRNT
113123
- Star TSP-650
114124
- Star TUP-592
115-
- SPRT SP-POS88V
125+
- Venus V248T
116126
- Xprinter F-900
127+
- Xprinter XP-58 Series
128+
- Xprinter XP-80C
129+
- Xprinter XP-90
117130
- XPrinter XP-Q20011
118131
- Xprinter XP-Q800
119-
- Xprinter XP-80C
120-
- Venus V248T
121132
- Zjiang NT-58H
122133
- Zjiang ZJ-5870
123-
- Zjiang ZJ-5890T (Marketed as POS 5890T)
124134
- Zjiang ZJ-5890K
135+
- Zjiang ZJ-5890T (Marketed as POS 5890T)
125136

126137
If you use any other printer with this code, please [let us know](https://github.com/mike42/escpos-php/issues/new) so that it can be added to the list.
127138

@@ -160,7 +171,7 @@ require __DIR__ . '/vendor/mike42/escpos-php/autoload.php';
160171
To maintain compatibility with as many systems as possible, this driver has few
161172
hard dependencies:
162173

163-
- PHP 5.3 or above
174+
- PHP 5.4 or above.
164175
- `mbstring` extension, since the driver accepts UTF-8 encoding.
165176

166177
It is also suggested that you install either `imagick` or `gd`, so that you can
@@ -531,7 +542,7 @@ This code is MIT licensed, and you are encouraged to contribute any modification
531542

532543
For development, it's suggested that you load `imagick`, `gd` and `Xdebug` PHP exensions, and install `composer`.
533544

534-
The tests are executed on [Travis CI](https://travis-ci.org/mike42/escpos-php) over PHP 5.3, 5.4, 5.5, 5.7, 7, and HHVM. Earlier versions of PHP are not supported.
545+
The tests are executed on [Travis CI](https://travis-ci.org/mike42/escpos-php) over PHP 5.4, 5.5, 5.6, 7.0, 7.1 and 7.2, plus the latest LTS version of HHVM, 3.21. Older versions of PHP are not supported in current releases.
535546

536547
Fetch a copy of this code and load dependencies with composer:
537548

@@ -552,20 +563,3 @@ The developer docs are build with [doxygen](https://github.com/doxygen/doxygen).
552563
make -C doc clean && make -C doc
553564

554565
Pull requests and bug reports welcome.
555-
556-
<!-- ## Other versions
557-
TODO: Some notes about related OSS projects will go here.
558-
Some forks of this project have been developed by others for specific use cases. Improvements from the following projects have been incorporated into escpos-php:
559-
560-
- [wdoyle/EpsonESCPOS-PHP](https://github.com/wdoyle/EpsonESCPOS-PHP)
561-
- [ronisaha/php-esc-pos](https://github.com/ronisaha/php-esc-pos)-->
562-
563-
<!--
564-
TODO: A table of printer models vs programming guides available via the web would be good, but should go outside this README
565-
## Vendor documentation
566-
Epson notes that not all of its printers support all ESC/POS features, and includes a table in their documentation:
567-
568-
* [FAQ about ESC/POS from Epson](http://content.epson.de/fileadmin/content/files/RSD/downloads/escpos.pdf)
569-
570-
Note that many printers produced by other vendors use the same standard, and are compatible by varying degrees.
571-
-->

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
],
1414
"config": {
1515
"platform": {
16-
"php": "5.3.9"
16+
"php": "5.4.0"
1717
}
1818
},
1919
"require": {
20-
"php": ">=5.3.9",
20+
"php": ">=5.4.0",
2121
"ext-mbstring": "*"
2222
},
2323
"suggest": {
@@ -26,9 +26,9 @@
2626
"ext-gd": "Used for image printing if present."
2727
},
2828
"require-dev": {
29-
"phpunit/phpunit": "4.8.*",
30-
"squizlabs/php_codesniffer": "2.*",
31-
"guzzlehttp/guzzle": "~3.0|~4.0|~5.0|~6.0"
29+
"phpunit/phpunit": "^4.8",
30+
"squizlabs/php_codesniffer": "^3.2",
31+
"guzzlehttp/guzzle": "^5.3"
3232
},
3333
"autoload": {
3434
"psr-4": {

0 commit comments

Comments
 (0)