Permalink
Browse files

Switched to composer and switched out php-reader for Iodophor

  • Loading branch information...
1 parent f6477c7 commit 536e1b68d830e0a63dd509a32793db33d7e06479 @magnusnordlander magnusnordlander committed Apr 4, 2012
View
@@ -1,2 +1,4 @@
.DS_Store
-*.sublime-*
+*.sublime-*
+vendor
+composer.lock
View
@@ -1,12 +0,0 @@
-[submodule "vendor/gaufrette"]
- path = vendor/gaufrette
- url = https://github.com/knplabs/Gaufrette.git
-[submodule "vendor/symfony-classloader/src/Symfony/Component/ClassLoader"]
- path = vendor/symfony-classloader/src/Symfony/Component/ClassLoader
- url = https://github.com/symfony/ClassLoader.git
-[submodule "vendor/php-reader"]
- path = vendor/php-reader
- url = git://github.com/e-butik/php-reader.git
-[submodule "vendor/vfsStream"]
- path = vendor/vfsStream
- url = git://github.com/mikey179/vfsStream.git
View
@@ -0,0 +1,25 @@
+{
+ "name": "e-butik/gittern",
+ "description": "A Git library written in pure PHP. Making Git like music for PHP's ears.",
+ "homepage": "http://github.com/e-butik/Gittern",
+ "license": "MIT",
+
+ "repositories": [
+ {
+ "type": "vcs",
+ "url": "https://github.com/e-butik/Iodophor"
+ }
+ ],
+
+ "require": {
+ "php": ">=5.3.0",
+ "knplabs/gaufrette": "dev-master",
+ "mikey179/vfsStream": "*",
+ "symfony/class-loader": "*",
+ "e-butik/iodophor": "dev-master"
+ },
+
+ "autoload": {
+ "psr-0": { "Gittern": "src" }
+ }
+}
View
@@ -9,7 +9,7 @@
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
- bootstrap="tests/bootstrap.php.dist"
+ bootstrap="vendor/.composer/autoload.php"
>
<testsuites>
<testsuite name="Gittern Test Suite">
@@ -6,8 +6,8 @@
use Gittern\GitObject\Tree;
use Gittern\GitObject\User;
-use Zend_Io_StringWriter as StringWriter;
-use Zend_Io_Writer as Writer;
+use Iodophor\Io\StringWriter;
+use Iodophor\Io\Writer;
/**
* @author Magnus Nordlander
@@ -7,8 +7,8 @@
use Gittern\IndexEntry;
use Gittern\Proxy\BlobProxy;
-use Zend_Io_Writer;
-use Zend_Io_StringWriter;
+use Iodophor\Io\StringWriter;
+use Iodophor\Io\Writer;
/**
* @author Magnus Nordlander
@@ -20,7 +20,7 @@ class IndexDesiccator
**/
public function desiccate(Index $index)
{
- $writer = new Zend_Io_StringWriter();
+ $writer = new StringWriter();
$entries = $index->getEntries();
@@ -75,7 +75,7 @@ public function desiccate(Index $index)
/**
* @author Magnus Nordlander
**/
- public function writeEntryTime(Zend_Io_Writer $writer, $time)
+ public function writeEntryTime(Writer $writer, $time)
{
$writer->writeInt32BE((int)$time);
//FIXME
@@ -4,7 +4,7 @@
use Gittern\GitObject\Tree;
-use Zend_Io_StringWriter as StringWriter;
+use Iodophor\Io\StringWriter;
/**
* @author Magnus Nordlander
@@ -7,8 +7,8 @@
use Gittern\IndexEntry;
use Gittern\Proxy\BlobProxy;
-use Zend_Io_Reader;
-use Zend_Io_StringReader;
+use Iodophor\Io\StringReader;
+use Iodophor\Io\Reader;
/**
* @author Magnus Nordlander
@@ -32,7 +32,7 @@ public function hydrate($data)
{
$index = new Index;
- $reader = new Zend_Io_StringReader($data);
+ $reader = new StringReader($data);
$signature = $reader->readString8(4);
@@ -112,7 +112,7 @@ public function hydrate($data)
/**
* @author Magnus Nordlander
**/
- public function readEntryTime(Zend_Io_Reader $reader)
+ public function readEntryTime(Reader $reader)
{
$time_lsb32 = $reader->readInt32BE();
$time_nsec = $reader->readUInt32BE();
@@ -2,7 +2,7 @@
namespace Gittern\Transport;
-use Zend_Io_FileReader as FileReader;
+use Iodophor\Io\FileReader;
/**
* @author Magnus Nordlander
@@ -2,7 +2,7 @@
namespace Gittern\Transport;
-use Zend_Io_Reader as Reader;
+use Iodophor\Io\Reader;
/**
*
@@ -2,7 +2,7 @@
namespace Gittern\Transport;
-use Zend_Io_Reader as Reader;
+use Iodophor\Io\Reader;
/**
*
View
@@ -1,22 +0,0 @@
-<?php
-
-require_once __DIR__.'/../vendor/symfony-classloader/src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
-
-use Symfony\Component\ClassLoader\UniversalClassLoader;
-
-$loader = new UniversalClassLoader();
-$loader->registerNamespaces(array(
- 'Gittern' => __DIR__.'/../src',
- 'Gaufrette' => __DIR__.'/../vendor/gaufrette/src',
- 'org\\bovigo\\vfs' => __DIR__.'/../vendor/vfsStream/src/main/php',
-));
-
-$zend_path = __DIR__.'/../vendor/php-reader/src';
-
-$loader->registerPrefixes(array(
- 'Zend_' => $zend_path,
-));
-
-set_include_path(get_include_path() . PATH_SEPARATOR . $zend_path);
-
-$loader->register();
Submodule gaufrette deleted from 8c4d82
Submodule php-reader deleted from 3354d7
Submodule ClassLoader deleted from 1c23c3
Submodule vfsStream deleted from 9c39fd

0 comments on commit 536e1b6

Please sign in to comment.