Skip to content

Commit 90b2282

Browse files
authored
Merge pull request #94 from SimpleSoftwareIO/develop
2.0.0
2 parents 0d8fbf7 + 2c44b49 commit 90b2282

24 files changed

+80
-102
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
language: php
22
sudo: false
33
php:
4-
- 5.6
54
- 7.0
65
- 7.1
7-
- hhvm
86

97
before_script:
108
- composer install --dev

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ Simple QrCode
33

44
##Change Log
55

6+
#### 2.0.0
7+
* Fixed a bug where the merge image was not reset correctly. (#93)
8+
* Added Laravel auto discovery support. (#82) - Thanks [mazedlx](https://github.com/mazedlx)
9+
610
#### 1.5.1
711
* Fixed a bug where a QrCode used within a loop would not generate correctly.
812

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Simple QrCode
99

1010
## [Español](https://www.simplesoftware.io/docs/simple-qrcode/es) | [Français](https://www.simplesoftware.io/docs/simple-qrcode/fr) | [Italiano](https://www.simplesoftware.io/docs/simple-qrcode/it) | [Português](https://www.simplesoftware.io/docs/simple-qrcode/pt-br) | [Русский](https://www.simplesoftware.io/docs/simple-qrcode/ru) | [हिंदी](https://www.simplesoftware.io/docs/simple-qrcode/hi) | [汉语](https://www.simplesoftware.io/docs/simple-qrcode/zh)
1111

12+
## Try our dead simple, free file transfer service [keep.sh](https://keep.sh)
13+
1214
## Introduction
1315
Simple QrCode is an easy to use wrapper for the popular Laravel framework based on the great work provided by [Bacon/BaconQrCode](https://github.com/Bacon/BaconQrCode). We created an interface that is familiar and easy to install for Laravel users.
1416

@@ -22,4 +24,4 @@ Please submit all issues and pull requests to the [simplesoftwareio/simple-qrcod
2224

2325
## License
2426

25-
This software is released under the [MIT license.](https://opensource.org/licenses/MIT)
27+
This software is released under the [MIT license.](https://opensource.org/licenses/MIT)

composer.json

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,28 @@
1111
}
1212
],
1313
"require": {
14-
"php": ">=5.4.0",
14+
"php": ">=7.0",
1515
"ext-gd": "*",
1616
"bacon/bacon-qr-code": "1.0.*",
17-
"illuminate/support": ">=4.2.0"
17+
"illuminate/support": ">=5.0.0"
1818
},
1919
"require-dev": {
2020
"mockery/mockery": "0.9.*",
21-
"phpunit/phpunit": "~5"
21+
"phpunit/phpunit": "~6"
2222
},
2323
"autoload": {
2424
"psr-0": {
2525
"SimpleSoftwareIO\\QrCode\\": "src"
2626
}
2727
},
28-
"minimum-stability": "stable"
29-
}
28+
"extra": {
29+
"laravel": {
30+
"providers": [
31+
"SimpleSoftwareIO\\QrCode\\QrCodeServiceProvider"
32+
],
33+
"aliases": {
34+
"QrCode": "SimpleSoftwareIO\\QrCode\\Facades\\QrCode"
35+
}
36+
}
37+
}
38+
}

docs/en/README.md

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Simple QrCode
77
[![License](https://poser.pugx.org/simplesoftwareio/simple-qrcode/license.svg)](https://packagist.org/packages/simplesoftwareio/simple-qrcode)
88
[![Total Downloads](https://poser.pugx.org/simplesoftwareio/simple-qrcode/downloads.svg)](https://packagist.org/packages/simplesoftwareio/simple-qrcode)
99

10-
####[Español](https://www.simplesoftware.io/docs/simple-qrcode/es) | [Français](https://www.simplesoftware.io/docs/simple-qrcode/fr) | [Italiano](https://www.simplesoftware.io/docs/simple-qrcode/it) | [Português](https://www.simplesoftware.io/docs/simple-qrcode/pt-br) | [Русский](https://www.simplesoftware.io/docs/simple-qrcode/ru) | [हिंदी](https://www.simplesoftware.io/docs/simple-qrcode/hi) | [汉语](https://www.simplesoftware.io/docs/simple-qrcode/zh)
10+
#### [Español](https://www.simplesoftware.io/docs/simple-qrcode/es) | [Français](https://www.simplesoftware.io/docs/simple-qrcode/fr) | [Italiano](https://www.simplesoftware.io/docs/simple-qrcode/it) | [Português](https://www.simplesoftware.io/docs/simple-qrcode/pt-br) | [Русский](https://www.simplesoftware.io/docs/simple-qrcode/ru) | [हिंदी](https://www.simplesoftware.io/docs/simple-qrcode/hi) | [汉语](https://www.simplesoftware.io/docs/simple-qrcode/zh)
1111

1212
- [Introduction](#docs-introduction)
1313
- [Translations](#docs-translations)
@@ -34,25 +34,19 @@ We are looking for users who speak Arabic, Spanish, French, Korean or Japanese t
3434
First, add the Simple QrCode package to your `require` in your `composer.json` file:
3535

3636
"require": {
37-
"simplesoftwareio/simple-qrcode": "~1"
37+
"simplesoftwareio/simple-qrcode": "~2"
3838
}
3939

4040
Next, run the `composer update` command.
4141

4242
#### Service Provider
4343

44-
###### Laravel 4
45-
Register the `SimpleSoftwareIO\QrCode\QrCodeServiceProvider` in your `app/config/app.php` within the `providers` array.
46-
47-
###### Laravel 5
44+
###### Laravel <= 5.4
4845
Register the `SimpleSoftwareIO\QrCode\QrCodeServiceProvider::class` in your `config/app.php` within the `providers` array.
4946

5047
#### Aliases
5148

52-
###### Laravel 4
53-
Finally, register the `'QrCode' => 'SimpleSoftwareIO\QrCode\Facades\QrCode'` in your `app/config/app.php` configuration file within the `aliases` array.
54-
55-
###### Laravel 5
49+
###### Laravel <= 5.4
5650
Finally, register the `'QrCode' => SimpleSoftwareIO\QrCode\Facades\QrCode::class` in your `config/app.php` configuration file within the `aliases` array.
5751

5852
<a id="docs-ideas"></a>
@@ -339,7 +333,7 @@ This helpers makes scannable QrCodes that can connect a phone to a WiFI network.
339333
>WiFi scanning is not currently supported on Apple Products.
340334
341335
<a id="docs-common-usage"></a>
342-
##Common QrCode Usage
336+
## Common QrCode Usage
343337

344338
You can use a prefix found in the table below inside the `generate` section to create a QrCode to store more advanced information:
345339

@@ -361,7 +355,7 @@ You can use a prefix found in the table below inside the `generate` section to c
361355
| Wifi | wifi: | wifi:WEP/WPA;SSID;PSK;Hidden(True/False) |
362356

363357
<a id="docs-outside-laravel"></a>
364-
##Usage Outside of Laravel
358+
## Usage Outside of Laravel
365359

366360
You may use this package outside of Laravel by instantiating a new `BaconQrCodeGenerator` class.
367361

docs/es/README.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,19 @@ Estamos buscando usuarios que hablen Árabe, Francés, Coreano o Japonés para t
3232
Primero, añadir el paquete Simple QrCode en su `require` en su archivo `composer.json`:
3333

3434
"require": {
35-
"simplesoftwareio/simple-qrcode": "~1"
35+
"simplesoftwareio/simple-qrcode": "~2"
3636
}
3737

3838
Luego, ejecutar el comando `composer update`.
3939

4040
#### Service Provider
4141

42-
###### Laravel 4
43-
Registrar `SimpleSoftwareIO\QrCode\QrCodeServiceProvider` en su `app/config/app.php` dentro del array `providers`.
44-
45-
###### Laravel 5
42+
###### Laravel <= 5.4
4643
Registrar `SimpleSoftwareIO\QrCode\QrCodeServiceProvider::class` en su `config/app.php` dentro del array `providers`.
4744

4845
#### Aliases
4946

50-
###### Laravel 4
51-
Finalmente, registrar `'QrCode' => 'SimpleSoftwareIO\QrCode\Facades\QrCode'` en su archivo de configuración `app/config/app.php` dentro del array `aliases`.
52-
53-
###### Laravel 5
47+
###### Laravel <= 5.4
5448
Finalmente, registrar `'QrCode' => SimpleSoftwareIO\QrCode\Facades\QrCode::class` en su archivo de configuración `config/app.php` dentro del array `aliases`.
5549

5650
<a id="docs-ideas"></a>

docs/fr/README.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,19 @@ Nous recherchons des utilisateurs parlant arabe, espagnol, français, coréen ou
3333
Commencez par ajouter le paquet QrCode à la section `require` de votre fichier `composer.json`:
3434

3535
"require": {
36-
"simplesoftwareio/simple-qrcode": "~1"
36+
"simplesoftwareio/simple-qrcode": "~2"
3737
}
3838

3939
Lancez ensuite la commande `composer update`.
4040

4141
#### Service Provider
4242

43-
###### Laravel 4
44-
Ajouter l'entrée `SimpleSoftwareIO\QrCode\QrCodeServiceProvider` au tableau `providers` du fichier de configuration `app/config/app.php`.
45-
46-
###### Laravel 5
43+
###### Laravel <= 5.4
4744
Ajouter l'entrée `SimpleSoftwareIO\QrCode\QrCodeServiceProvider::class` au tableau `providers` du fichier de configuration `config/app.php`.
4845

4946
#### Alias
5047

51-
###### Laravel 4
52-
Enfin, ajoutez l'entrée `'QrCode' => 'SimpleSoftwareIO\QrCode\Facades\QrCode'` au tableau `aliases` du fichier de configuration `app/config/app.php`.
53-
54-
###### Laravel 5
48+
###### Laravel <= 5.4
5549
Enfin, ajoutez l'entrée `'QrCode' => SimpleSoftwareIO\QrCode\Facades\QrCode::class` au tableau `aliases` du fichier de configuration `config/app.php`.
5650

5751
<a id="docs-ideas"></a>

docs/hi/README.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,19 @@ Simple QrCode
3232
सर्वप्रथं composer.json मे qrcode पॅकेज को अपने require से जोड़ें:
3333

3434
"require": {
35-
"simplesoftwareio/simple-qrcode": "~1"
35+
"simplesoftwareio/simple-qrcode": "~2"
3636
}
3737

3838
फिर composer update कमॅंड चलाएँ।
3939

4040
#### Service Provider
4141

42-
###### Laravel 4
43-
app/config/app.php में providers array में SimpleSoftwareIO\QrCode\QrCodeServiceProvider को रजिस्टर करें।
44-
45-
###### Laravel 5
42+
###### Laravel <= 5.4
4643
config/app.php में providers array में SimpleSoftwareIO\QrCode\QrCodeServiceProvider::class को रजिस्टर करें।
4744

4845
#### Aliases (उपनाम)
4946

50-
###### Laravel 4
51-
आखिर में 'QrCode' => 'SimpleSoftwareIO\QrCode\Facades\QrCode' को app/config/app.php विन्यास फ़ाइल में aliases array में रजिस्टर करें।
52-
53-
###### Laravel 5
47+
###### Laravel <= 5.4
5448
आखिर में 'QrCode' => SimpleSoftwareIO\QrCode\Facades\QrCode::class को config/app.php विन्यास फ़ाइल में aliases array में रजिस्टर करें।
5549

5650
<a id="docs-ideas"></a>

docs/it/README.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,19 @@ Siamo alla ricerca di utenti che ci aiutino a tradurre la documentazione in Arab
3232
Per prima cosa, aggiungete il pacchetto di Simple QrCode al file `require` in `composer.json`:
3333

3434
"require": {
35-
"simplesoftwareio/simple-qrcode": "~1"
35+
"simplesoftwareio/simple-qrcode": "~2"
3636
}
3737

3838
Ora lanciate il comando `composer update`.
3939

4040
#### Service Provider
4141

42-
###### Laravel 4
43-
Registrate `SimpleSoftwareIO\QrCode\QrCodeServiceProvider` nel vostro `app/config/app.php` all'interno dell'array `providers`.
44-
45-
###### Laravel 5
42+
###### Laravel <= 5.4
4643
Registrate `SimpleSoftwareIO\QrCode\QrCodeServiceProvider::class` nel vostro `config/app.php` all'interno dell'array `providers`.
4744

4845
#### Alias
4946

50-
###### Laravel 4
51-
Infine, registrate `'QrCode' => 'SimpleSoftwareIO\QrCode\Facades\QrCode'` nel vostro file di configurazione `app/config/app.php` all'interno dell'array `aliases`.
52-
53-
###### Laravel 5
47+
###### Laravel <= 5.4
5448
Infine, registrate `'QrCode' => SimpleSoftwareIO\QrCode\Facades\QrCode::class` nel vostro file di configurazione `config/app.php` all'interno dell'array `aliases`.
5549

5650
<a id="docs-ideas"></a>

docs/pt-br/README.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,19 @@ Simple QrCode é wrapper de fácil uso do Framework Laravel, baseado no grande t
3232
Primeiramente, adicione o pacote Simple QrCode ao seu `require` no arquivo `composer.json`:
3333

3434
"require": {
35-
"simplesoftwareio/simple-qrcode": "~1"
35+
"simplesoftwareio/simple-qrcode": "~2"
3636
}
3737

3838
Próximo, execute o comando `composer update`.
3939

4040
#### Provedor de Serviço
4141

42-
###### Laravel 4
43-
Registre o `SimpleSoftwareIO\QrCode\QrCodeServiceProvider` em seu `app/config/app.php` dentro do array`providers`.
44-
45-
###### Laravel 5
42+
###### Laravel <= 5.4
4643
Registre a `SimpleSoftwareIO\QrCode\QrCodeServiceProvider::class` em seu `config/app.php` dentro do array `providers`.
4744

4845
#### Aliases
4946

50-
###### Laravel 4
51-
Finalmente, registre o `'QrCode' => 'SimpleSoftwareIO\QrCode\Facades\QrCode'` em seu arquivo de configuração `app/config/app.php` dentro do array `aliases`.
52-
53-
###### Laravel 5
47+
###### Laravel <= 5.4
5448
Finally, register the `'QrCode' => SimpleSoftwareIO\QrCode\Facades\QrCode::class` em seu arquivo de configuração `config/app.php` dentro do array `aliases`.
5549

5650
<a id="docs-ideas"></a>

0 commit comments

Comments
 (0)