Skip to content

Commit

Permalink
Added short license header for Apache 2.0 license to all class files.…
Browse files Browse the repository at this point in the history
… Added phpstorm project files to gitignore. Added composer vendor directory to gitignore. Added composer.lock file to gitignore. Removed Basho from the directory tier and adjusted the autoload from PSR-0 -> PSR-4. Removed home grown test suite, added phpunit as composer dependency for dev. Moved Riak class outside of Basho\Riak namespace so you didn't have Basho\Riak\Riak... Moved copyright from the Apache License short header to the Class Doc Comment annotations. Began developing Node / NodeBuilder code to allow for quickly building out node pool with client applications in preparation of supporting connections to a pool of nodes versus single instance.
  • Loading branch information
Christopher Mancini committed Oct 14, 2014
1 parent 49f6273 commit 0b58508
Show file tree
Hide file tree
Showing 20 changed files with 1,004 additions and 1,560 deletions.
3 changes: 1 addition & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -174,5 +174,4 @@
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

END OF TERMS AND CONDITIONS
16 changes: 11 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
{
"name": "basho/riak",
"description": "Official Riak PHP client for PHP 5.3",
"description": "Official Riak client for PHP",
"keywords": ["riak", "client", "driver", "database", "nosql"],
"homepage": "http://basho.com/riak/",
"license": "Apache-2.0",
"authors": [
{
"name": "Riak Team",
"name": "Riak Team & Contributors",
"homepage": "https://github.com/basho/riak-php-client/contributors"
}
],
"autoload": {
"psr-0": { "Basho": "src/" }
"psr-4": {"Basho\\": "src/"}
},
"require": {
"php": ">=5.3.0",
"centraldesktop/protobuf-php": "0.6.*",
"php": ">=5.4",
"ext-json": "*",
"ext-mbstring": "*",
"ext-curl": "*"
},
"require-dev": {
"phpunit/phpunit": "4.3.1"
}
}
}
2 changes: 1 addition & 1 deletion phpdoc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
<template name="responsive-twig" />
</transformations>
<files>
<directory>src/Basho/Riak</directory>
<directory>src/Riak</directory>
</files>
</phpdoc>
31 changes: 0 additions & 31 deletions src/Basho/Riak/Exception.php

This file was deleted.

57 changes: 0 additions & 57 deletions src/Basho/Riak/Link/Phase.php

This file was deleted.

62 changes: 0 additions & 62 deletions src/Basho/Riak/StringIO.php

This file was deleted.

Loading

0 comments on commit 0b58508

Please sign in to comment.