Skip to content

S
solarium
Commit 6bdcf281 authored by Markus Kalkbrenner's avatar Markus Kalkbrenner Committed by GitHub
Browse files
Options

Merge pull request #552 from solariumphp/master-cleaning 

clean-up and phar support removal
parents ef598a8d 3c543717
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 152 deletions
.gitattributes
View file @ 6bdcf281
/.coveralls export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
......
.gitignore
View file @ 6bdcf281
/build
/phpunit.xml
/composer.phar
/composer.lock
/vendor
/phar/solarium.phar
.idea
README.md
View file @ 6bdcf281
......@@ -11,7 +11,7 @@ Please see the docs for a more detailed description.
## Requirements
Solarium only supports PHP 5.4 and up.
Solarium only supports PHP 5.6 and up.
It's highly recommended to have Curl enabled in your PHP environment. However if you don't have Curl available you can
switch from using Curl (the default) to another client adapter. The other adapters don't support all the features of the
Curl adapter.
......@@ -37,9 +37,8 @@ The preferred way to install Solarium is by using Composer. Solarium is availabl
## Continuous Integration status
* 4.x develop branch [![Develop build status](https://secure.travis-ci.org/solariumphp/solarium.png?branch=4.x)](http://travis-ci.org/solariumphp/solarium) [![Coverage Status](https://coveralls.io/repos/solariumphp/solarium/badge.png?branch=4.x)](https://coveralls.io/r/solariumphp/solarium?branch=4.x)
* 3.x develop branch [![Develop build status](https://secure.travis-ci.org/solariumphp/solarium.png?branch=develop)](http://travis-ci.org/solariumphp/solarium) [![Coverage Status](https://coveralls.io/repos/solariumphp/solarium/badge.png?branch=develop)](https://coveralls.io/r/solariumphp/solarium?branch=develop)
* 3.x master branch [![Develop build status](https://secure.travis-ci.org/solariumphp/solarium.png?branch=master)](http://travis-ci.org/solariumphp/solarium) [![Coverage Status](https://coveralls.io/repos/solariumphp/solarium/badge.png?branch=master)](https://coveralls.io/r/solariumphp/solarium?branch=master)
* 4.x branch (master) [![Develop build status](https://secure.travis-ci.org/solariumphp/solarium.png?branch=master)](http://travis-ci.org/solariumphp/solarium) [![Coverage Status](https://coveralls.io/repos/solariumphp/solarium/badge.png?branch=master)](https://coveralls.io/r/solariumphp/solarium?branch=master)
* 3.x branch [![Develop build status](https://secure.travis-ci.org/solariumphp/solarium.png?branch=3.x)](http://travis-ci.org/solariumphp/solarium) [![Coverage Status](https://coveralls.io/repos/solariumphp/solarium/badge.png?branch=3.x)](https://coveralls.io/r/solariumphp/solarium?branch=3.x)
* [![SensioLabsInsight](https://insight.sensiolabs.com/projects/292e29f7-10a9-4685-b9ac-37925ebef9ae/small.png)](https://insight.sensiolabs.com/projects/292e29f7-10a9-4685-b9ac-37925ebef9ae)
* [![Total Downloads](https://poser.pugx.org/solarium/solarium/downloads.svg)](https://packagist.org/packages/solarium/solarium)
phar/README deleted 100644 → 0
View file @ ef598a8d
The buildphar.php will generate a solarium.phar PHAR file that is ready for distribution.
phar/buildphar.php deleted 100644 → 0
View file @ ef598a8d
<?php
/**
* Copyright 2012 Bas de Nooijer. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this listof conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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 COPYRIGHT HOLDER OR CONTRIBUTORS 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.
*
* The views and conclusions contained in the software and documentation are
* those of the authors and should not be interpreted as representing official
* policies, either expressed or implied, of the copyright holder.
*
* @copyright Copyright 2012 Bas de Nooijer <solarium@raspberry.nl>
* @license http://github.com/basdenooijer/solarium/raw/master/COPYING
* @link http://www.solarium-project.org/
*/
// Check phar.readonly ini setting
if (ini_get('phar.readonly') == '1') {
throw new \RuntimeException("Your php.ini has phar.readonly enabled. Phar cannot be created. Please alter your php.ini first.\n");
}
// You can optionally use arguments to enable compression and whitespace/comment stripping.
// Example: "php buildphar.php -s 1 -c 1"
// -c with a value of 1 enables compression, multiple phars will be created
// -s with a value of 1 enables stripping
$options = getopt('s:c:');
$compress = (isset($options['c']) && $options['c'] == '1');
$strip = (isset($options['s']) && $options['s'] == '1');
$start = microtime(true);
// Create a new Solarium PHAR file.
@unlink('solarium.phar');
$phar = new Phar('solarium.phar', 0, 'solarium.phar');
$phar->setStub(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'stub.php'));
$phar->setSignatureAlgorithm(Phar::SHA1);
// Add files to the PHAR.
$basePath = dirname(__DIR__);
$directoryIterator = new AppendIterator();
$directoryIterator->append(
new RecursiveIteratorIterator(
new RecursiveDirectoryIterator($basePath . DIRECTORY_SEPARATOR . 'library'),
RecursiveIteratorIterator::SELF_FIRST
)
);
$directoryIterator->append(
new RecursiveIteratorIterator(
new RecursiveDirectoryIterator($basePath . DIRECTORY_SEPARATOR . 'vendor'),
RecursiveIteratorIterator::SELF_FIRST
)
);
if ($strip) {
foreach ($directoryIterator as $file) {
if (0 !== preg_match('/\\.php$/i', $file)) {
$phar->addFromString(substr($file, strlen($basePath) + 1), php_strip_whitespace($file));
}
}
} else {
$phar->buildFromIterator($directoryIterator, $basePath);
}
// Create compressed versions
if ($compress) {
$phar->compress(Phar::BZ2);
$phar->compress(Phar::GZ);
}
$time = round(microtime(true)-$start, 5);
echo "\nDONE ($time seconds)\nsolarium.phar has been created.\n\n";
phar/stub.php deleted 100644 → 0
View file @ ef598a8d
<?php
/**
* Copyright 2012 Bas de Nooijer. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this listof conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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 COPYRIGHT HOLDER OR CONTRIBUTORS 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.
*
* The views and conclusions contained in the software and documentation are
* those of the authors and should not be interpreted as representing official
* policies, either expressed or implied, of the copyright holder.
*
* @copyright Copyright 2012 Bas de Nooijer <solarium@raspberry.nl>
* @license http://github.com/basdenooijer/solarium/raw/master/COPYING
* @link http://www.solarium-project.org/
*/
Phar::mapPhar("solarium.phar");
require_once 'phar://solarium.phar/vendor/autoload.php';
\Solarium\Autoloader::register();
if ('cli' === php_sapi_name() && basename(__FILE__) === basename($_SERVER['argv'][0]) && isset($_SERVER['argv'][1])) {
switch ($_SERVER['argv'][1]) {
case 'version':
echo "Solarium version " . \Solarium\Client::VERSION ."\n";
break;
default:
echo 'Unknown command \'' . $_SERVER['argv'][1] . '\' (Supported commands: version)' . "\n";
}
}
__HALT_COMPILER();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment