Skip to content

Commit

Permalink
update entire library to work with bacon qr code instead
Browse files Browse the repository at this point in the history
  • Loading branch information
tonydspaniard committed Aug 24, 2017
1 parent b034402 commit 94542c5
Show file tree
Hide file tree
Showing 483 changed files with 4,122 additions and 5,993 deletions.
56 changes: 41 additions & 15 deletions .gitignore
@@ -1,25 +1,51 @@
build
composer.lock
docs
vendor
# yii console command
/yii

# cache directories
Thumbs.db
*.DS_Store
*.empty

#phpstorm project files
# phpstorm project files
.idea

#netbeans project files
# netbeans project files
nbproject

#eclipse, zend studio, aptana or other eclipse like project files
# zend studio for eclipse project files
.buildpath
.project
.settings

# windows thumbnail cache
Thumbs.db

# composer vendor dir
/vendor

# no need in composer distribution
/composer.phar

# Mac DS_Store Files
.DS_Store

/phpunit.phar
# local phpunit config
/phpunit.xml

# vagrant runtime
/.vagrant
# vagrant folder we are not using it
vagrant
Vagrantfile

# javascript files
/node_modules
tests/_support/_generated
tests/_output/*

# temporary directory for various purposes
/temp

# ignore local codeception settings
codeception.yml

# mac deployment helpers
switch
index
# Code Style Checkers and Mess Detectors
/phpcs.xml
/.php_cs.cache
/.php_cs
48 changes: 48 additions & 0 deletions .php_cs.dist
@@ -0,0 +1,48 @@
<?php
$header = <<<'EOF'
This file is part of the 2amigos/yii2-qrcode-component project.
(c) 2amigOS! <http://2amigos.us/>
For the full copyright and license information, please view
the LICENSE file that was distributed with this source code.
EOF;

$finder = PhpCsFixer\Finder::create()
->exclude([
'.github',
'docs',
'temp',
'tests',
'vendor',
])
->in(__DIR__);

return PhpCsFixer\Config::create()
->setRules(array(
'@PSR1' => true,
'@PSR2' => true,
'header_comment' => ['header' => $header],
'array_syntax' => array('syntax' => 'short'),
'combine_consecutive_unsets' => true,
'no_extra_consecutive_blank_lines' => array(
'break',
'continue',
'extra',
'return',
'throw',
'use',
'parenthesis_brace_block',
'square_brace_block',
'curly_brace_block'
),
'no_useless_else' => true,
'no_useless_return' => true,
'ordered_class_elements' => true,
'ordered_imports' => true,
'phpdoc_add_missing_param_annotation' => true,
'phpdoc_order' => true,
'phpdoc_align' => true

))
->setFinder($finder);
4 changes: 2 additions & 2 deletions .travis.yml
@@ -1,9 +1,9 @@
language: php

php:
- 5.5
- 5.6
- hhvm
- 7.0
- 7.1

install:
- composer self-update
Expand Down
19 changes: 12 additions & 7 deletions composer.json
@@ -1,14 +1,14 @@
{
"name": "2amigos/yii2-qrcode-helper",
"description": "Create QrCodes based on libqrencode C library.",
"name": "2amigos/yii2-qrcode-component",
"description": "QrCode Generator",
"type": "yii2-extension",
"keywords": [
"2amigos",
"yii",
"yii2",
"yii 2",
"extension",
"helper",
"component",
"qrcode"
],
"homepage": "http://yiiwheels.com/extension/qrcode-helper",
Expand All @@ -26,20 +26,25 @@
"source": "https://github.com/2amigos/yii2-qrcode-helper"
},
"require": {
"yiisoft/yii2": "*"
"php": ">=5.6",
"ext-gd": "*",
"bacon/bacon-qr-code": "^1.0",
"khanamiryan/qrcode-detector-decoder": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "4.*",
"yiisoft/yii2": "*",
"phpunit/phpunit": "5.*",
"friendsofphp/php-cs-fixer": "^2.3",
"scrutinizer/ocular": "~1.1"
},
"autoload": {
"psr-4": {
"dosamigos\\qrcode\\": "src"
"Da\\QrCode\\": "./src"
}
},
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
}
}
}

0 comments on commit 94542c5

Please sign in to comment.