Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes for release 2.0 #538

Merged
merged 26 commits into from
Mar 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3509f77
Set SMB2 as default highest allowed protocol
Dec 14, 2017
748e6a0
add UriPrintConnector from evsar3 #314
mike42 Mar 12, 2018
c94a39f
readme updates
mike42 Mar 12, 2018
73ec3f8
update composer versions
mike42 Mar 12, 2018
2100702
new phpcs fixes
mike42 Mar 12, 2018
4e12466
breaking change to ensure that PHP 5.3 users stick with escpos-php 1.…
mike42 Mar 12, 2018
dfc7f0e
Merge pull request #532 from mike42/530-dependency-update
mike42 Mar 12, 2018
1ab18a8
Merge branch 'development' of github.com:mike42/escpos-php into 1dal-…
mike42 Mar 12, 2018
74407f6
update expected output of smbclient usage in WindowsPrintConnectorTest
mike42 Mar 12, 2018
b849df4
Merge pull request #533 from mike42/1dal-feature/better-smb-support
mike42 Mar 12, 2018
e8d9b96
update printer list & sort: closes #528 #527 #517 #499 #487 #483 #472…
mike42 Mar 12, 2018
01eddf7
Merge pull request #534 from mike42/readme-updates
mike42 Mar 12, 2018
7e3c3a3
refactor UriPrintConnector & add tests
mike42 Mar 13, 2018
d51f040
Merge pull request #535 from mike42/314-uri-print-connector
mike42 Mar 13, 2018
13979f9
try another hhvm build
mike42 Mar 13, 2018
95e8f75
remove pecl imagick install from hhvm builds
mike42 Mar 13, 2018
447dff0
readme update
mike42 Mar 13, 2018
2bdfaf4
Merge pull request #536 from mike42/396-hhvm-again
mike42 Mar 13, 2018
3b4894f
Improve test > 80% coverage ahead of new release
mike42 Mar 13, 2018
14a3f74
phpcbf fix
mike42 Mar 13, 2018
d7ca165
Merge pull request #537 from mike42/imagick-test
mike42 Mar 13, 2018
127b812
Update supported PHP versions in CONTRIBUTING.md
mike42 Mar 13, 2018
ecbf32e
Merge branch 'master' into development
mike42 Mar 13, 2018
87c50bb
Update capabilities DB
mike42 Mar 13, 2018
e859737
Merge pull request #539 from mike42/mike42-patch-1
mike42 Mar 13, 2018
82c4d41
Merge pull request #540 from mike42/cababilities-db-update
mike42 Mar 13, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,15 @@ php:
- 5.6
- 7.0
- 7.1
- 7.2
- nightly
- hhvm-3.21
- hhvm-nightly

matrix:
allow_failures:
- php: nightly
- php: hhvm-nightly

before_install:
- sudo apt-get -qq update
Expand All @@ -25,7 +29,7 @@ install:

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

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ This project uses the [PSR-2 standard](https://github.com/php-fig/fig-standards/

## Testing and CI

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.
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.

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

Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Main repository: [mike42/escpos-php](https://github.com/mike42/escpos-php) ([onl
- [matiasgaston](https://github.com/matiasgaston)
- [Mike Stivala](https://github.com/brndwgn)
- [Nicholas Long](https://github.com/longsview)
- [Evandro Araújo](https://github.com/evsar3)

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

Expand Down
56 changes: 25 additions & 31 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,30 +67,35 @@ This driver is known to work with the following OS/interface combinations:
### Printers
Many thermal receipt printers support ESC/POS to some degree. This driver has been known to work with:

- 3nStrat POS-08
- AURES ODP-333
- AURES ODP-500
- Bematech-4200-TH
- Bixolon SRP-350III
- Black Copper BC-85AC
- Citizen CBM1000-II
- Citizen CT-S310II
- Dapper-Geyi Q583P
- Daruma DR800
- EPOS TEP 220M
- Epson TM-T88II
- Epson TM-T88III
- Epson TM-T88IV
- Epson TM-T88V
- Epson TM-T70
- Epson TM-T82II
- Epson EU-T332C
- Epson FX-890 (requires `feedForm()` to release paper).
- Epson TM-T20
- Epson TM-T20II
- Epson TM-T70
- Epson TM-T70II
- Epson TM-T81
- Epson TM-T82II
- Epson TM-T88II
- Epson TM-T88III
- Epson TM-T88IV
- Epson TM-T88V
- Epson TM-U220
- Epson TM-U295 (requires `release()` to release slip).
- Epson TM-U590 and TM-U590P
- Epson FX-890 (requires `feedForm()` to release paper).
- Equal (EQ-IT-001) POS-58
- Excelvan HOP-E58
- Excelvan HOP-E200
- Excelvan HOP-E58
- Excelvan HOP-E801
- Excelvan ZJ-8220
- Gainscha GP-5890x (Also marketed as EC Line 5890x)
Expand All @@ -100,28 +105,34 @@ Many thermal receipt printers support ESC/POS to some degree. This driver has be
- Metapace T-1
- Metapace T-25
- Nexa PX700
- Nyear NP100
- Okipos 80 Plus III
- Orient BTP-R580
- P-822D
- P85A-401 (make unknown)
- Rongta RP326US
- Rongta RP58-U
- Senor TP-100
- SEYPOS PRP-300 (Also marketed as TYSSO PRP-300)
- Sicar POS-80
- Silicon SP-201 / RP80USE
- SPRT SP-POS88V
- Star BSC10
- Star TSP100 ECO
- Star TSP100III FuturePRNT
- Star TSP-650
- Star TUP-592
- SPRT SP-POS88V
- Venus V248T
- Xprinter F-900
- Xprinter XP-58 Series
- Xprinter XP-80C
- Xprinter XP-90
- XPrinter XP-Q20011
- Xprinter XP-Q800
- Xprinter XP-80C
- Venus V248T
- Zjiang NT-58H
- Zjiang ZJ-5870
- Zjiang ZJ-5890T (Marketed as POS 5890T)
- Zjiang ZJ-5890K
- Zjiang ZJ-5890T (Marketed as POS 5890T)

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.

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

- PHP 5.3 or above
- PHP 5.4 or above.
- `mbstring` extension, since the driver accepts UTF-8 encoding.

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

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

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.
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.

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

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

Pull requests and bug reports welcome.

<!-- ## Other versions
TODO: Some notes about related OSS projects will go here.
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:

- [wdoyle/EpsonESCPOS-PHP](https://github.com/wdoyle/EpsonESCPOS-PHP)
- [ronisaha/php-esc-pos](https://github.com/ronisaha/php-esc-pos)-->

<!--
TODO: A table of printer models vs programming guides available via the web would be good, but should go outside this README
## Vendor documentation
Epson notes that not all of its printers support all ESC/POS features, and includes a table in their documentation:

* [FAQ about ESC/POS from Epson](http://content.epson.de/fileadmin/content/files/RSD/downloads/escpos.pdf)

Note that many printers produced by other vendors use the same standard, and are compatible by varying degrees.
-->
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
],
"config": {
"platform": {
"php": "5.3.9"
"php": "5.4.0"
}
},
"require": {
"php": ">=5.3.9",
"php": ">=5.4.0",
"ext-mbstring": "*"
},
"suggest": {
Expand All @@ -26,9 +26,9 @@
"ext-gd": "Used for image printing if present."
},
"require-dev": {
"phpunit/phpunit": "4.8.*",
"squizlabs/php_codesniffer": "2.*",
"guzzlehttp/guzzle": "~3.0|~4.0|~5.0|~6.0"
"phpunit/phpunit": "^4.8",
"squizlabs/php_codesniffer": "^3.2",
"guzzlehttp/guzzle": "^5.3"
},
"autoload": {
"psr-4": {
Expand Down
Loading