cleanup

.gitattributes

@@ -0,0 +1,8 @@
+# Auto-detect text files, ensure they use LF.
+*       text=auto eol=lf
+
+# These files are always considered text and should use LF.
+# See core.whitespace @ http://git-scm.com/docs/git-config for whitespace flags.
+*.php   text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4 diff=php
+*.json  text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4
+*.test  text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4

.gitignore

@@ -1,9 +1,8 @@
-/.settings
-/.project
-/.idea
-/.buildpath
-/satis.phar
-/vendor
-/phpunit.xml
-composer.phar
-.php_cs.cache
+/.settings
+/.project
+/.idea
+/.buildpath
+/vendor
+phpunit.xml
+composer.phar
+satis.phar

.php_cs

@@ -12,12 +12,15 @@ EOF;
 $finder = Symfony\CS\Finder\DefaultFinder::create()
     ->files()
     ->name('*.php')
-    ->in(__DIR__.'/src')
-    ->in(__DIR__.'/tests')
+    ->exclude('vendor')
+    ->in(__DIR__)
 ;
 
 /* fabpot/php-cs-fixer:^2.0-dev */
-return Symfony\CS\Config\Config::create()
+return Symfony\CS\Config\Config::create('Satis', 'Satis style guide')
+    ->setUsingCache(false)
+    ->setUsingLinter(true)
+    ->setRiskyAllowed(true)
     ->setRules(array(
         '@PSR2' => true,
         'concat_without_spaces' => true,

.travis.yml

@@ -24,11 +24,13 @@ matrix:
   allow_failures:
     - php: nightly
 
-before_script:
+before_install:
   - rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
-  - flags=""
-  - if [ `phpenv version-name` == "5.3.3" ]; then flags="--ignore-platform-reqs"; fi
-  - composer install $flags --no-interaction --no-progress --prefer-dist
+  - flags="--no-interaction --no-progress --prefer-dist"
+  - if [ `phpenv version-name` == "5.3.3" ]; then flags="--ignore-platform-reqs $flags"; fi
+
+install:
+  - composer install $flags
 
 script:
   - vendor/bin/phpunit

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Jordi Boggiano, Nils Adermann
+Copyright (c) 2015 Jordi Boggiano, Nils Adermann
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -4,7 +4,9 @@ Satis - Package Repository Generator
 Simple static Composer repository generator.
 
 It uses any composer.json file as input and dumps all the required (according
-to their version constraints) packages to a Composer Repository file.
+to their version constraints) packages into a Composer Repository file.
+
+[![Build Status](https://travis-ci.org/composer/satis.svg?branch=master)](https://travis-ci.org/composer/satis)
 
 Usage
 -----
@@ -24,9 +26,8 @@ Updating is as simple as running `git pull && php composer.phar install` in the
 Contributing
 ------------
 
-All code contributions - including those of people having commit access -
-must go through a pull request and approved by a core developer before being
-merged. This is to ensure proper review of all the code.
+Please note that this project is released with a [Contributor Code of Conduct](http://contributor-covenant.org/version/1/2/0/).
+By participating in this project you agree to abide by its terms.
 
 Fork the project, create a feature branch, and send us a pull request.
 

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "composer/satis",
     "description": "Simple Repository Generator",
-    "keywords": ["package", "repository", "generator"],
+    "keywords": ["package", "repository", "generator", "static", "composer"],
     "homepage": "https://github.com/composer/satis",
     "type": "library",
     "license": "MIT",
@@ -19,10 +19,10 @@
     ],
     "bin": ["bin/satis"],
     "require": {
-        "php": ">=5.3.2",
-        "composer/composer": "1.0.*@dev",
-        "twig/twig": "~1.7",
-        "symfony/console": "~2.1"
+        "php": "^5.3.2 || ^7.0",
+        "composer/composer": "^1.0.*@dev",
+        "twig/twig": "^1.7",
+        "symfony/console": "^2.1"
     },
     "autoload": {
         "psr-0": { "Composer\\Satis": "src/" }
@@ -31,7 +31,8 @@
         "psr-0": { "Composer\\Test\\Satis": "tests/" }
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.5|^5.0.5",
+        "phpunit/phpunit": "^4.5 || ^5.0.5",
+        "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0",
         "mikey179/vfsStream": "^1.6"
     }
 }

phpunit.xml.dist

@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.6/phpunit.xsd"
+    backupGlobals="false"
+    bootstrap="tests/bootstrap.php"
+    colors="true"
 >
+
     <testsuites>
         <testsuite name="Satis Test Suite">
             <directory>./tests/Composer/</directory>
@@ -22,4 +18,9 @@
             <directory>./src/Composer/</directory>
         </whitelist>
     </filter>
+
+    <logging>
+        <log type="coverage-text" target="php://stdout" />
+    </logging>
+
 </phpunit>

tests/Composer/Test/Satis/WebBuilderDumpTest.php

@@ -81,7 +81,7 @@ public function testDependencies()
         $webBuilder->dump(array($this->package));
 
         $html = $this->root->getChild('build/index.html')->getContent();
-        
+
         $this->assertRegExp('/<a href="#dummytest">dummytest<\/a>/', $html);
     }
 }