Skip to content

Commit

Permalink
Merge pull request #20 from markdunphy/vendor-namespace
Browse files Browse the repository at this point in the history
Restructure: Rename Cassandra folder to src. Add vendor namespace across all files.
  • Loading branch information
evseevnn committed Aug 31, 2014
2 parents 5517bda + db36270 commit 7185308
Show file tree
Hide file tree
Showing 27 changed files with 64 additions and 62 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
vendor
coverage
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ $nodes = [
];

// Connect to database.
$database = new Cassandra\Database($nodes, 'my_keyspace');
$database = new evseevnn\Cassandra\Database($nodes, 'my_keyspace');
$database->connect();

// Run query.
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"php": ">=5.4.0"
},
"autoload": {
"psr-4": { "Cassandra\\": "Cassandra/" }
"psr-4": { "evseevnn\\Cassandra\\": "src/" }
}
}
6 changes: 3 additions & 3 deletions Cassandra/Cluster.php → src/Cluster.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace Cassandra;
use Cassandra\Cluster\Node;
use Cassandra\Exception\ClusterException;
namespace evseevnn\Cassandra;
use evseevnn\Cassandra\Cluster\Node;
use evseevnn\Cassandra\Exception\ClusterException;

class Cluster {

Expand Down
4 changes: 2 additions & 2 deletions Cassandra/Cluster/Node.php → src/Cluster/Node.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace Cassandra\Cluster;
namespace evseevnn\Cassandra\Cluster;

use Cassandra\Exception\ConnectionException;
use evseevnn\Cassandra\Exception\ConnectionException;

class Node {

Expand Down
18 changes: 9 additions & 9 deletions Cassandra/Connection.php → src/Connection.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php
namespace Cassandra;
use Cassandra\Cluster\Node;
use Cassandra\Enum;
use Cassandra\Exception\ConnectionException;
use Cassandra\Protocol\Frame;
use Cassandra\Protocol\Request;
use Cassandra\Protocol\Response;
namespace evseevnn\Cassandra;
use evseevnn\Cassandra\Cluster\Node;
use evseevnn\Cassandra\Enum;
use evseevnn\Cassandra\Exception\ConnectionException;
use evseevnn\Cassandra\Protocol\Frame;
use evseevnn\Cassandra\Protocol\Request;
use evseevnn\Cassandra\Protocol\Response;

class Connection {

Expand Down Expand Up @@ -56,7 +56,7 @@ public function isConnected() {

/**
* @param Request $request
* @return \Cassandra\Protocol\Response
* @return \evseevnn\Cassandra\Protocol\Response
*/
public function sendRequest(Request $request) {
$frame = new Frame(Enum\VersionEnum::REQUEST, $request->getType(), $request);
Expand Down Expand Up @@ -94,7 +94,7 @@ private function getResponse() {
}

/**
* @return \Cassandra\Cluster\Node
* @return \evseevnn\Cassandra\Cluster\Node
*/
public function getNode() {
return $this->node;
Expand Down
16 changes: 8 additions & 8 deletions Cassandra/Database.php → src/Database.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php
namespace Cassandra;
use Cassandra\Enum\ConsistencyEnum;
use Cassandra\Enum\OpcodeEnum;
use Cassandra\Exception\CassandraException;
use Cassandra\Exception\ConnectionException;
use Cassandra\Exception\QueryException;
use Cassandra\Protocol\RequestFactory;
use Cassandra\Protocol\Response\Rows;
namespace evseevnn\Cassandra;
use evseevnn\Cassandra\Enum\ConsistencyEnum;
use evseevnn\Cassandra\Enum\OpcodeEnum;
use evseevnn\Cassandra\Exception\CassandraException;
use evseevnn\Cassandra\Exception\ConnectionException;
use evseevnn\Cassandra\Exception\QueryException;
use evseevnn\Cassandra\Protocol\RequestFactory;
use evseevnn\Cassandra\Protocol\Response\Rows;

class Database {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Cassandra\Enum;
namespace evseevnn\Cassandra\Enum;

class ConsistencyEnum {
const CONSISTENCY_ANY = 0x0000;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Cassandra\Enum;
namespace evseevnn\Cassandra\Enum;

class DataTypeEnum {
const CUSTOM = 0x0000;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Cassandra\Enum;
namespace evseevnn\Cassandra\Enum;

class ErrorCodesEnum {
const SERVER_ERROR = 0x0000;
Expand Down
2 changes: 1 addition & 1 deletion Cassandra/Enum/FlagsEnum.php → src/Enum/FlagsEnum.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Cassandra\Enum;
namespace evseevnn\Cassandra\Enum;

class FlagsEnum {
const COMPRESSION = 0x01;
Expand Down
2 changes: 1 addition & 1 deletion Cassandra/Enum/OpcodeEnum.php → src/Enum/OpcodeEnum.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Cassandra\Enum;
namespace evseevnn\Cassandra\Enum;

class OpcodeEnum {
const ERROR = 0x00;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Cassandra\Enum;
namespace evseevnn\Cassandra\Enum;

class ResultTypeEnum {
const VOID = 0x0001;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Cassandra\Enum;
namespace evseevnn\Cassandra\Enum;

class VersionEnum {
const REQUEST = 0x01;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php
namespace Cassandra\Exception;
namespace evseevnn\Cassandra\Exception;

class CassandraException extends \Exception {}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php
namespace Cassandra\Exception;
namespace evseevnn\Cassandra\Exception;

class ClusterException extends \Exception {}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php
namespace Cassandra\Exception;
namespace evseevnn\Cassandra\Exception;

class ConnectionException extends \Exception {}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php
namespace Cassandra\Exception;
namespace evseevnn\Cassandra\Exception;

class QueryException extends \Exception {}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php
namespace Cassandra\Exception;
namespace evseevnn\Cassandra\Exception;

class ResponseException extends \Exception {}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
namespace Cassandra\Protocol;
use Cassandra\Enum\DataTypeEnum;
namespace evseevnn\Cassandra\Protocol;
use evseevnn\Cassandra\Enum\DataTypeEnum;

class BinaryData {

Expand Down
2 changes: 1 addition & 1 deletion Cassandra/Protocol/Frame.php → src/Protocol/Frame.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Cassandra\Protocol;
namespace evseevnn\Cassandra\Protocol;

class Frame {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Cassandra\Protocol;
namespace evseevnn\Cassandra\Protocol;

class Request {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
namespace Cassandra\Protocol;
use Cassandra\Enum\OpcodeEnum;
namespace evseevnn\Cassandra\Protocol;
use evseevnn\Cassandra\Enum\OpcodeEnum;

final class RequestFactory {

Expand All @@ -24,7 +24,7 @@ final class RequestFactory {
* This is optional, if not specified no compression will be used.
*
* @param array $option
* @return \Cassandra\Protocol\Request
* @return \evseevnn\Cassandra\Protocol\Request
*/
public static function startup(array $option = []) {
$body = pack('n', count($option));
Expand Down Expand Up @@ -53,7 +53,7 @@ public static function startup(array $option = []) {
*
* @param string $user
* @param string $password
* @return \Cassandra\Protocol\Request
* @return \evseevnn\Cassandra\Protocol\Request
*/
public static function credentials($user, $password) {
$body = pack('n', 2);
Expand Down Expand Up @@ -90,7 +90,7 @@ public function options() {
*
* @param string $cql
* @param int $consistency
* @return \Cassandra\Protocol\Request
* @return \evseevnn\Cassandra\Protocol\Request
*/
public static function query($cql, $consistency) {
$body = pack('N', strlen($cql)) . $cql . pack('n', $consistency);
Expand All @@ -107,7 +107,7 @@ public static function query($cql, $consistency) {
* see Section 4.2.5).
*
* @param string $cql
* @return \Cassandra\Protocol\Request
* @return \evseevnn\Cassandra\Protocol\Request
*/
public static function prepare($cql) {
$body = pack('N', strlen($cql)) . $cql;
Expand All @@ -133,7 +133,7 @@ public static function prepare($cql) {
* @param array $prepareData
* @param array $values
* @param int $consistency
* @return \Cassandra\Protocol\Request
* @return \evseevnn\Cassandra\Protocol\Request
*/
public static function execute(array $prepareData, array $values, $consistency) {
$body = pack('n', strlen($prepareData['id'])) . $prepareData['id'];
Expand Down
18 changes: 9 additions & 9 deletions Cassandra/Protocol/Response.php → src/Protocol/Response.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?php
namespace Cassandra\Protocol;
use Cassandra\Enum\DataTypeEnum;
use Cassandra\Enum\ErrorCodesEnum;
use Cassandra\Enum\OpcodeEnum;
use Cassandra\Enum\ResultTypeEnum;
use Cassandra\Exception\ResponseException;
use Cassandra\Protocol\Response\DataStream;
use Cassandra\Protocol\Response\DataStream\TypeReader;
use Cassandra\Protocol\Response\Rows;
namespace evseevnn\Cassandra\Protocol;
use evseevnn\Cassandra\Enum\DataTypeEnum;
use evseevnn\Cassandra\Enum\ErrorCodesEnum;
use evseevnn\Cassandra\Enum\OpcodeEnum;
use evseevnn\Cassandra\Enum\ResultTypeEnum;
use evseevnn\Cassandra\Exception\ResponseException;
use evseevnn\Cassandra\Protocol\Response\DataStream;
use evseevnn\Cassandra\Protocol\Response\DataStream\TypeReader;
use evseevnn\Cassandra\Protocol\Response\Rows;

class Response {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace Cassandra\Protocol\Response;
namespace evseevnn\Cassandra\Protocol\Response;

use Cassandra\Enum\DataTypeEnum;
use evseevnn\Cassandra\Enum\DataTypeEnum;

class DataStream {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace Cassandra\Protocol\Response\DataStream;
use Cassandra\Enum\DataTypeEnum;
use Cassandra\Protocol\Response\DataStream;
namespace evseevnn\Cassandra\Protocol\Response\DataStream;
use evseevnn\Cassandra\Enum\DataTypeEnum;
use evseevnn\Cassandra\Protocol\Response\DataStream;

final class TypeReader {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Cassandra\Protocol\Response;
namespace evseevnn\Cassandra\Protocol\Response;

class Rows implements \Iterator, \Countable {

Expand Down

0 comments on commit 7185308

Please sign in to comment.