Skip to content

Commit

Permalink
minor fix to previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
Wakie87 committed Sep 13, 2016
1 parent 670ad77 commit a56077c
Show file tree
Hide file tree
Showing 39 changed files with 3,311 additions and 70 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"phenx/php-svg-lib": "0.1",
"dompdf/dompdf": "0.7.0",
"doctrine/common": "2.5.0",
"doctrine/couchdb": "1.0.*@dev"
"doctrine/couchdb": "1.0-beta2"

},
"require-dev": {
Expand Down
24 changes: 11 additions & 13 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

108 changes: 53 additions & 55 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -706,61 +706,6 @@
"parser"
]
},
{
"name": "doctrine/couchdb",
"version": "dev-master",
"version_normalized": "9999999-dev",
"source": {
"type": "git",
"url": "https://github.com/doctrine/couchdb-client.git",
"reference": "911c01716730af0fc0b5074a0740fddce3156ac0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/couchdb-client/zipball/911c01716730af0fc0b5074a0740fddce3156ac0",
"reference": "911c01716730af0fc0b5074a0740fddce3156ac0",
"shasum": ""
},
"require": {
"php": ">=5.4"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
},
"time": "2016-08-06 11:26:41",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
"Doctrine\\CouchDB": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Benjamin Eberlei",
"email": "[email protected]"
},
{
"name": "Lukas Kahwe Smith",
"email": "[email protected]"
}
],
"description": "CouchDB Client",
"homepage": "http:https://www.doctrine-project.org",
"keywords": [
"couchdb",
"persistence"
]
},
{
"name": "zendframework/zendframework",
"version": "2.4.9",
Expand Down Expand Up @@ -1089,5 +1034,58 @@
"persistence",
"spl"
]
},
{
"name": "doctrine/couchdb",
"version": "1.0.0-beta2",
"version_normalized": "1.0.0.0-beta2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/couchdb-client.git",
"reference": "5e8d808eba8d790d178e5558c182c648a12ec8e4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/couchdb-client/zipball/5e8d808eba8d790d178e5558c182c648a12ec8e4",
"reference": "5e8d808eba8d790d178e5558c182c648a12ec8e4",
"shasum": ""
},
"require": {
"doctrine/common": "@stable",
"php": ">=5.3.2"
},
"time": "2015-07-06 16:08:10",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Doctrine\\CouchDB": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL"
],
"authors": [
{
"name": "Benjamin Eberlei",
"email": "[email protected]"
},
{
"name": "Lukas Kahwe Smith",
"email": "[email protected]"
}
],
"description": "CouchDB Client",
"homepage": "http:https://www.doctrine-project.org",
"keywords": [
"couchdb",
"persistence"
]
}
]
1 change: 0 additions & 1 deletion vendor/doctrine/couchdb
Submodule couchdb deleted from 911c01
14 changes: 14 additions & 0 deletions vendor/doctrine/couchdb/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
language: php

services:
- couchdb

php:
- 5.3
- 5.4
- 5.5
- 5.6

before_script:
- curl -X PUT localhost:5984/doctrine_test_database
- composer install
8 changes: 8 additions & 0 deletions vendor/doctrine/couchdb/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Copyright (c) 2006-2012 Doctrine Project

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

40 changes: 40 additions & 0 deletions vendor/doctrine/couchdb/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Doctrine CouchDB Client

[![Build Status](https://travis-ci.org/doctrine/couchdb-client.png?branch=master)](https://travis-ci.org/doctrine/couchdb-client)

Simple API that wraps around CouchDBs HTTP API.

## Features

* Create, Delete Databases
* Create, Update, Delete Documents
* Bulk API for Creating/Updating Documents
* Find Documents by ID
* Generate UUIDs
* Query `_all_docs` view
* Query Changes Feed
* Compaction Info and Triggering APIs
* Replication API
* Symfony Console Commands

## Installation

With Composer:

{
"require": {
"doctrine/couchdb": "@dev"
}
}

## Usage

```php
<?php
$client = \Doctrine\CouchDB\CouchDBClient::create();

array($id, $rev) = $client->postDocument(array('foo' => 'bar'));
$client->putDocument(array('foo' => 'baz'), $id, $rev);

$doc = $client->findDocument($id);
```
26 changes: 26 additions & 0 deletions vendor/doctrine/couchdb/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"name": "doctrine/couchdb",
"type": "library",
"description": "CouchDB Client",
"keywords": ["persistence", "couchdb"],
"homepage": "http:https://www.doctrine-project.org",
"license": "LGPL",
"authors": [
{"name": "Benjamin Eberlei", "email": "[email protected]"},
{"name": "Lukas Kahwe Smith", "email": "[email protected]"}
],
"require": {
"php": ">=5.3.2",
"doctrine/common": "@stable"
},
"autoload": {
"psr-0": {
"Doctrine\\CouchDB": "lib/"
}
},
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
}
}
93 changes: 93 additions & 0 deletions vendor/doctrine/couchdb/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a56077c

Please sign in to comment.