Remove need for global phpcs and php-cs-fixer

This commit is contained in:
Craig Davis 2014-01-12 19:58:14 -07:00
parent 07b70ef799
commit 9ebc5d669a
8 changed files with 229 additions and 12 deletions

View File

@ -1,11 +1,11 @@
[![Build Status](https://travis-ci.org/there4/markdown-resume.png?branch=master)](https://travis-ci.org/there4/markdown-resume)
# Markdown Resume Generator
Turn a simple Markdown document into an elegant resume with both a perfect
pdf printable format, and a responsive css3 html5 file. You can view a sample
at the [blog post for the project][blog].
[![Build Status](https://travis-ci.org/there4/markdown-resume.png?branch=master)](https://travis-ci.org/there4/markdown-resume)
## Features
* Three styles to choose from: modern, blockish, unstyled (Fork and add more!)
@ -83,7 +83,6 @@ The application is deployed as a compiled phar file. In order to add new
commands, you'll need to first install the dependencies:
* `composer install`
* `pear install PHP_CodeSniffer`
* [install pake][pake]
After that, you can run the `md2resume_dev.php` file from the command line.

Binary file not shown.

View File

@ -43,10 +43,12 @@
"require": {
"kriswallsmith/assetic": "1.1.2",
"leafo/lessphp": "v0.4.0",
"fabpot/php-cs-fixer": "0.4.0",
"michelf/php-markdown": "1.4.0",
"michelf/php-smartypants": "1.6.0-beta1",
"mustache/mustache": "2.5.1",
"simple-html-dom/simple-html-dom": "1.5.0",
"squizlabs/php_codesniffer": "1.*",
"symfony/config": "v2.3.4",
"symfony/console": "v2.3.4",
"symfony/yaml": "v2.3.4",
@ -56,5 +58,8 @@
"classmap": [
"vendor/simple-html-dom/simple-html-dom/"
]
}
},
"bin": [
"bin/md2resume"
]
}

217
composer.lock generated
View File

@ -3,8 +3,56 @@
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
],
"hash": "d9ac9e8bf489e24869014b77959a93ea",
"hash": "7c8fb9a08e3469fc9aaf81003b3ba5b3",
"packages": [
{
"name": "fabpot/php-cs-fixer",
"version": "v0.4.0",
"source": {
"type": "git",
"url": "https://github.com/fabpot/PHP-CS-Fixer.git",
"reference": "ff49782b0d87007ec675216f3677644778489d7a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fabpot/PHP-CS-Fixer/zipball/ff49782b0d87007ec675216f3677644778489d7a",
"reference": "ff49782b0d87007ec675216f3677644778489d7a",
"shasum": ""
},
"require": {
"php": ">=5.3.6",
"sebastian/diff": "1.1.*",
"symfony/console": "~2.1",
"symfony/filesystem": "~2.1",
"symfony/finder": "~2.1"
},
"bin": [
"php-cs-fixer"
],
"type": "application",
"extra": {
"branch-alias": {
"dev-master": "0.4.x-dev"
}
},
"autoload": {
"psr-0": {
"Symfony\\CS": "."
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
"description": "A script to automatically fix Symfony Coding Standard",
"time": "2014-01-07 09:13:46"
},
{
"name": "kriswallsmith/assetic",
"version": "v1.1.2",
@ -268,6 +316,56 @@
],
"time": "2014-01-09 00:36:09"
},
{
"name": "sebastian/diff",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
"reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d",
"reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
}
},
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de",
"role": "lead"
},
{
"name": "Kore Nordmann",
"email": "mail@kore-nordmann.de"
}
],
"description": "Diff implementation",
"homepage": "http://www.github.com/sebastianbergmann/diff",
"keywords": [
"diff"
],
"time": "2013-08-03 16:46:33"
},
{
"name": "simple-html-dom/simple-html-dom",
"version": "1.5.0",
@ -297,6 +395,76 @@
"description": "A copy of the PHP Simple HTML DOM Parser project.",
"time": "2013-05-14 22:27:35"
},
{
"name": "squizlabs/php_codesniffer",
"version": "1.5.1",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "bd1e50b8c252c914881dba1dcef089219e430dbd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/bd1e50b8c252c914881dba1dcef089219e430dbd",
"reference": "bd1e50b8c252c914881dba1dcef089219e430dbd",
"shasum": ""
},
"require": {
"ext-tokenizer": "*",
"php": ">=5.1.2"
},
"suggest": {
"phpunit/php-timer": "dev-master"
},
"bin": [
"scripts/phpcs"
],
"type": "library",
"autoload": {
"classmap": [
"CodeSniffer.php",
"CodeSniffer/CLI.php",
"CodeSniffer/Exception.php",
"CodeSniffer/File.php",
"CodeSniffer/Report.php",
"CodeSniffer/Reporting.php",
"CodeSniffer/Sniff.php",
"CodeSniffer/Tokens.php",
"CodeSniffer/Reports/",
"CodeSniffer/CommentParser/",
"CodeSniffer/Tokenizers/",
"CodeSniffer/DocGenerators/",
"CodeSniffer/Standards/AbstractPatternSniff.php",
"CodeSniffer/Standards/AbstractScopeSniff.php",
"CodeSniffer/Standards/AbstractVariableSniff.php",
"CodeSniffer/Standards/IncorrectPatternException.php",
"CodeSniffer/Standards/Generic/Sniffs/",
"CodeSniffer/Standards/MySource/Sniffs/",
"CodeSniffer/Standards/PEAR/Sniffs/",
"CodeSniffer/Standards/PSR1/Sniffs/",
"CodeSniffer/Standards/PSR2/Sniffs/",
"CodeSniffer/Standards/Squiz/Sniffs/",
"CodeSniffer/Standards/Zend/Sniffs/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Greg Sherwood",
"role": "lead"
}
],
"description": "PHP_CodeSniffer tokenises PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
"homepage": "http://www.squizlabs.com/php-codesniffer",
"keywords": [
"phpcs",
"standards"
],
"time": "2013-12-12 03:08:49"
},
{
"name": "symfony/config",
"version": "v2.3.4",
@ -445,6 +613,53 @@
"homepage": "http://symfony.com",
"time": "2014-01-07 13:29:57"
},
{
"name": "symfony/finder",
"version": "dev-master",
"target-dir": "Symfony/Component/Finder",
"source": {
"type": "git",
"url": "https://github.com/symfony/Finder.git",
"reference": "9a267caac6298b91efc7f0bc8522fd80f48fee98"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Finder/zipball/9a267caac6298b91efc7f0bc8522fd80f48fee98",
"reference": "9a267caac6298b91efc7f0bc8522fd80f48fee98",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.5-dev"
}
},
"autoload": {
"psr-0": {
"Symfony\\Component\\Finder\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
}
],
"description": "Symfony Finder Component",
"homepage": "http://symfony.com",
"time": "2014-01-07 13:29:57"
},
{
"name": "symfony/process",
"version": "dev-master",

View File

@ -68,6 +68,7 @@ function run_phar()
. 'php -dphar.readonly=0 build/empir make ./bin/md2resume.phar md2resume_dev.php . --exclude="'
. '*.git/*|*.gitignore|*test*|*Tests*|*.md|*/doc/*|*.lock|*token.txt|pakefile'
. '|.*|build/*|*.markdown|*.phar|*LICENSE|*AUTHORS|*CHANGELOG|*.dist|*.tpl|.travis.yml'
. '|*squizlabs*|*fabpot*'
. '" && chmod a+x ./bin/md2resume.phar'
. ' && mv ./bin/md2resume.phar ./bin/md2resume';
passthru($command);
@ -76,16 +77,16 @@ function run_phar()
function run_sniff()
{
echo " * Checking files for PSR2\n";
passthru("phpcs -p --standard=PSR2 ./src/ ./md2resume_dev.php");
passthru("./vendor/bin/phpcs -p --standard=PSR2 ./src/ ./md2resume_dev.php");
}
function run_fixer()
{
echo "\n * Running php-cs-fixer\n";
passthru(
"php-cs-fixer fix ./md2resume_dev.php"
. " && php-cs-fixer fix ./src/Resume/Cli/"
. " && php-cs-fixer fix ./src/Resume/Command/"
"./vendor/bin/php-cs-fixer fix ./md2resume_dev.php"
. " && ./vendor/bin/php-cs-fixer fix ./src/Resume/Cli/"
. " && ./vendor/bin/php-cs-fixer fix ./src/Resume/Command/"
);
}

View File

@ -12,7 +12,6 @@ use Resume\Command;
class Resume extends Application
{
public $defaultTemplate = 'modern';
public $recentCaseLimit = 10;

View File

@ -1,7 +1,6 @@
<?php
namespace Resume\Command;
use Resume\Command\HtmlCommand;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputArgument;

View File

@ -7,7 +7,6 @@ use Resume\Cli\Resume;
class ResumeTest extends \PHPUnit_Framework_TestCase
{
public $console;
public function setUp()