Skip to content

Commit

Permalink
fixed composer & bootsrap. Added license
Browse files Browse the repository at this point in the history
  • Loading branch information
HenriVesala committed Jun 19, 2012
1 parent 2f66949 commit 556b989
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 9 deletions.
27 changes: 27 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Copyright (c) 2011, Mikko Forsström, Mikko Hirvonen, Eevert Saukkokoski
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

* Neither the names of the authors nor the names of contributors may be used
to endorse or promote products derived from this software without specific
prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2 changes: 1 addition & 1 deletion Tests/bootstrap.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

if (!@include __DIR__ . '/vendor/autoload.php') {
if (!@include __DIR__ . '/../vendor/autoload.php') {
die("You must set up the project dependencies, run the following commands:
wget http://getcomposer.org/composer.phar
php composer.phar install
Expand Down
8 changes: 0 additions & 8 deletions Tests/composer.json

This file was deleted.

18 changes: 18 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "xi/search-bundle",
"description": "Xi Search Bundle provides you frontend logic for elasticsearch",
"keywords": ["search", "elasticsearch", "elastic", "elastica"],
"type": "symfony-bundle",
"require": {
"symfony/framework-bundle": "=v2.0.14",
"symfony/form": "=v2.0.14",
"symfony/dependency-injection": "=v2.0.14",
"twig/twig": "1.*"
},
"autoload": {
"psr-0": {
"Xi\\Bundle\\SearchBundle": ""
}
}

}

0 comments on commit 556b989

Please sign in to comment.