Skip to content

Commit

Permalink
Split package jskos-http
Browse files Browse the repository at this point in the history
  • Loading branch information
nichtich committed Aug 18, 2017
1 parent ddff0d0 commit 4a151fe
Show file tree
Hide file tree
Showing 15 changed files with 37 additions and 1,174 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,4 @@ phpunit.xml
composer.phar
composer.lock
*.rej

doc/
build/
gh-pages/
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ language: php
php:
- 7.0
- 7.1
- 7.2

matrix:
fast_finish: true
Expand All @@ -12,7 +13,7 @@ install:

script:
- mkdir -p build/logs
- composer travis-test
- composer test

after_script:
- php vendor/bin/coveralls
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
# jskos - access and serve JSKOS data and services
# jskos - JSKOS data model in PHP

[![Latest Stable Version](https://poser.pugx.org/gbv/jskos/v/stable)](https://packagist.org/packages/gbv/jskos)
[![License](https://poser.pugx.org/gbv/jskos/license)](https://packagist.org/packages/gbv/jskos)
[![Total Downloads](https://poser.pugx.org/gbv/jskos/downloads)](https://packagist.org/packages/gbv/jskos)

[![Build Status](https://img.shields.io/travis/gbv/jskos-php.svg)](https://travis-ci.org/gbv/jskos-php)
[![Coverage Status](https://coveralls.io/repos/gbv/jskos-php/badge.svg?branch=master)](https://coveralls.io/r/gbv/jskos-php)
[![Coding Style](https://img.shields.io/badge/coding style-PRS--2-green.svg)](http://www.php-fig.org/psr/psr-2/)
[![Logger Interface](https://img.shields.io/badge/logger interface-PRS--3-green.svg)](http://www.php-fig.org/psr/psr-3/)

**jskos** is a PHP library for easy processing of knowledge organization systems (KOS) as classifications, thesauri, and authority files given in [JSKOS data format](http://gbv.github.io/jskos/). JSKOS is a JSON format based on [Simple Knowledge Organisation System (SKOS)](http://www.w3.org/TR/skos-reference).

Expand Down Expand Up @@ -54,8 +52,13 @@ Jakob Voß <jakob.voss@gbv.de>

JSKOS-PHP is licensed under the LGPL license - see `LICENSE.md` for details.

# See alse
# See also

JSKOS is created as part of project coli-conc: <https://coli-conc.gbv.de/>.

The current specification of JSKOS is available at <http://gbv.github.io/jskos/>.

Additional PHP packages for JSKOS processing:

* [jskos-http](https://packagist.org/packages/gbv/jskos-http)
* [jskos-rdf](https://packagist.org/packages/gbv/jskos-rdf)
18 changes: 7 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gbv/jskos",
"description": "PHP library to access and serve JSKOS data and services",
"keywords": ["SKOS"],
"description": "JSKOS data model in PHP",
"keywords": ["SKOS", "Knowledge Organization"],
"homepage": "http://gbv.github.io/jskos-php/",
"type": "library",
"license": "LGPL",
Expand All @@ -12,18 +12,18 @@
}
],
"require": {
"php": ">=5.6",
"symfony/yaml": ">=2.8.0"
"php": ">=7.0"
},
"suggest": {
"gbv/jskos-rdf": ">=0.1.2",
"gbv/jskos-http": "^0.1",
"gbv/jskos-rdf": "^0.2",
"psr/log": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "~6.1",
"jakub-onderka/php-parallel-lint": "~0.9",
"jakub-onderka/php-console-highlighter": "~0.3",
"friendsofphp/php-cs-fixer": "^1.12"
"friendsofphp/php-cs-fixer": "~2.0"
},
"autoload": {
"psr-4": {
Expand All @@ -32,15 +32,11 @@
},
"scripts": {
"test": [
"vendor/bin/parallel-lint --exclude vendor .",
"vendor/bin/phpunit tests --coverage-text"
],
"travis-test": [
"vendor/bin/parallel-lint --exclude vendor .",
"vendor/bin/phpunit tests --coverage-clover build/logs/clover.xml"
],
"style": [
"vendor/bin/php-cs-fixer fix --level=psr2 src/"
"vendor/bin/php-cs-fixer fix src/"
]
}
}
40 changes: 0 additions & 40 deletions src/ConfiguredService.php

This file was deleted.

16 changes: 8 additions & 8 deletions src/Error.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ class Error extends PrettyJsonSerializable
*
* @todo check member constraints: code and error must be set properly
*/
public function __construct($code, $error, $message, $description=null, $uri=null)
{
$this->code = $code;
$this->error = $error;
$this->message = $message;
$this->description = $description;
$this->uri = $uri;
}
public function __construct($code, $error, $message, $description=null, $uri=null)
{
$this->code = $code;
$this->error = $error;
$this->message = $message;
$this->description = $description;
$this->uri = $uri;
}
}
2 changes: 1 addition & 1 deletion src/PrettyJsonSerializable.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public function jsonSerializeRoot($context=self::DEFAULT_CONTEXT)
*/
public function __toString()
{
return json_encode($this, JSON_UNESCAPED_SLASHES);
return json_encode($this, JSON_UNESCAPED_SLASHES);
}

/**
Expand Down
24 changes: 12 additions & 12 deletions src/Response.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@ class Response
*/
public $status;

/**
* @var array
*/
/**
* @var array
*/
public $headers;

/**
* @var string
*/
/**
* @var string
*/
public $content;

/**
* @var boolean
*/
/**
* @var boolean
*/
public $emptyBody;

/**
* @var string
*/
/**
* @var string
*/
public $callback;

/**
Expand Down

0 comments on commit 4a151fe

Please sign in to comment.