Skip to content
This repository has been archived by the owner on Feb 1, 2021. It is now read-only.

Commit

Permalink
added composer support
Browse files Browse the repository at this point in the history
removing submodules
copy of old gitmodules
composer support, tests passing, web service loading correctly
removed old gitmodules
removed app debug
removed specific git /usr/bin/git path
  • Loading branch information
cordoval committed Feb 18, 2012
1 parent 087a7d4 commit cb34ca5
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 29 deletions.
9 changes: 0 additions & 9 deletions .gitmodules

This file was deleted.

12 changes: 1 addition & 11 deletions compile
Expand Up @@ -8,17 +8,7 @@ use Symfony\Component\ClassLoader\UniversalClassLoader;
use Symfony\Component\ClassLoader\ClassCollectionLoader;
use Symfony\Component\Finder\Finder;

require_once __DIR__.'/vendor/silex/autoload.php';

$loader = new UniversalClassLoader();
$loader->registerNamespaces(array(
'Sismo' => __DIR__.'/src',
'Symfony' => __DIR__.'/vendor',
));
$loader->registerPrefixes(array(
'Twig_' => __DIR__.'/vendor/silex/vendor/twig/lib',
));
$loader->register();
require_once __DIR__.'/vendor/.composer/autoload.php';

@mkdir(__DIR__.'/build', 0777, true);
@unlink(__DIR__.'/build/sismo.php');
Expand Down
31 changes: 31 additions & 0 deletions composer.json
@@ -0,0 +1,31 @@
{
"name": "sismo/sismo",
"type": "silex application",
"description": "Sismo is a personal continuous integration server.",
"keywords": ["sismo, continuous integration"],
"homepage": "http://sismo.sensiolabs.org",
"license": "MIT",
"authors": [
{
"name": "Fabien Potencier",
"email": "fabpot@symfony.com"
},
{
"name": "Sismo Community",
"homepage": "https://github.com/fabpot/sismo/contributors"
}
],
"require": {
"php": ">=5.3.2",
"silex/silex": ">=1.0.0-dev",
"symfony/console": "2.1.*",
"symfony/twig-bridge": "2.1.*",
"symfony/process": "2.1.*",
"symfony/http-foundation": "2.1.*",
"symfony/filesystem": "2.1.*",
"symfony/finder": "2.1.*"
},
"autoload": {
"psr-0": { "Sismo": "src/" }
}
}
1 change: 1 addition & 0 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion phpunit.xml.dist
Expand Up @@ -9,7 +9,7 @@
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
bootstrap="src/autoload.php"
bootstrap="vendor/.composer/autoload.php"
>
<testsuites>
<testsuite name="Sismo Test Suite">
Expand Down
2 changes: 1 addition & 1 deletion sismo
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php

require_once __DIR__.'/src/autoload.php';
require_once __DIR__.'/vendor/.composer/autoload.php';
$app = require __DIR__.'/src/app.php';
$console = require __DIR__.'/src/console.php';
$console->run();
2 changes: 1 addition & 1 deletion tests/Sismo/Tests/GithubProjectTest.php
Expand Up @@ -12,7 +12,7 @@
namespace Sismo\Tests;

use Sismo\GithubProject;
use Symfony\Component\HttpKernel\Util\Filesystem;
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\Process\Process;

class GithubProjectTest extends \PHPUnit_Framework_TestCase
Expand Down
2 changes: 1 addition & 1 deletion tests/appTest.php
Expand Up @@ -9,7 +9,7 @@
* with this source code in the file LICENSE.
*/

use Symfony\Component\HttpKernel\Util\Filesystem;
use Symfony\Component\Filesystem\Filesystem;

class AppTest extends \PHPUnit_Framework_TestCase
{
Expand Down
2 changes: 1 addition & 1 deletion tests/controllersTest.php
Expand Up @@ -11,7 +11,7 @@

use Silex\WebTestCase;
use Sismo\Project;
use Symfony\Component\HttpKernel\Util\Filesystem;
use Symfony\Component\Filesystem\Filesystem;

class ControllersTest extends WebTestCase
{
Expand Down
1 change: 0 additions & 1 deletion vendor/Symfony/Bridge/Twig
Submodule Twig deleted from 7e8b26
1 change: 0 additions & 1 deletion vendor/Symfony/Component/Console
Submodule Console deleted from eeea9f
1 change: 0 additions & 1 deletion vendor/silex
Submodule silex deleted from 669238
2 changes: 1 addition & 1 deletion web/index.php
@@ -1,6 +1,6 @@
<?php

require_once __DIR__.'/../src/autoload.php';
require_once __DIR__.'/../vendor/.composer/autoload.php';
$app = require __DIR__.'/../src/app.php';
require __DIR__.'/../src/controllers.php';
$app->run();

0 comments on commit cb34ca5

Please sign in to comment.