Skip to content

Commit 34f35e0

Browse files
committed
Api and dependencies updates.
1 parent e373c5b commit 34f35e0

70 files changed

Lines changed: 451 additions & 238 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.php_cs

Lines changed: 42 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,52 @@
22

33
// Invoke the config easily with `php-cs-fixer fix`
44

5-
$finder = Symfony\CS\Finder\DefaultFinder::create()
5+
$finder = \PhpCsFixer\Finder::create()
66
->files()
77
->name('*.php')
88
->in(__DIR__ . '/src')
99
->in(__DIR__ . '/tests');
1010

11-
return Symfony\CS\Config\Config::create()
11+
return PhpCsFixer\Config::create()
1212
->setUsingCache(false)
13-
->level(Symfony\CS\FixerInterface::NONE_LEVEL)
14-
->fixers(array(
15-
'psr0', 'encoding', 'short_tag', 'braces', 'elseif', 'eof_ending', 'function_call_space', 'function_declaration',
16-
'indentation', 'line_after_namespace', 'linefeed', 'lowercase_constants', 'lowercase_keywords', 'method_argument_space',
17-
'multiple_use', 'parenthesis', 'php_closing_tag', 'trailing_spaces', 'visibility', 'array_element_no_space_before_comma',
18-
'array_element_white_space_after_comma', 'blankline_after_open_tag', 'duplicate_semicolon', 'extra_empty_lines',
19-
'function_typehint_space', 'include', 'list_commas ', 'namespace_no_leading_whitespace', 'no_blank_lines_after_class_opening ',
20-
'no_empty_lines_after_phpdocs ', 'object_operator', 'operators_spaces', 'phpdoc_indent', 'phpdoc_params',
21-
'return', 'self_accessor', 'single_array_no_trailing_comma', 'single_quote', 'spaces_cast', 'standardize_not_equal',
22-
'ternary_spaces', 'unneeded_control_parentheses', 'unused_use', 'whitespacy_lines', 'short_array_syntax',
23-
'align_double_arrow', 'align_equals'
13+
->setRules(array(
14+
'psr4' => true,
15+
'encoding' => true,
16+
'full_opening_tag' => true,
17+
'braces' => true,
18+
'elseif' => true,
19+
'single_blank_line_at_eof' => true,
20+
'no_spaces_after_function_name' => true,
21+
'function_declaration' => true,
22+
'blank_line_after_namespace' => true,
23+
'blank_line_before_statement' => true,
24+
'lowercase_constants' => true,
25+
'lowercase_keywords' => true,
26+
'method_argument_space' => true,
27+
'no_closing_tag' => true,
28+
'no_trailing_whitespace' => true,
29+
'visibility_required' => true,
30+
'blank_line_after_opening_tag' => true,
31+
'no_empty_statement' => true,
32+
'no_extra_blank_lines' => true,
33+
'function_typehint_space' => true,
34+
'include' => true,
35+
'no_blank_lines_after_phpdoc' => true,
36+
'object_operator_without_whitespace' => true,
37+
'phpdoc_indent' => true,
38+
'phpdoc_align' => true,
39+
'self_accessor' => true,
40+
'no_trailing_comma_in_list_call' => true,
41+
'single_quote' => true,
42+
'cast_spaces' => true,
43+
'standardize_not_equals' => true,
44+
'ternary_operator_spaces' => true,
45+
'no_unneeded_control_parentheses' => true,
46+
'no_unused_imports' => true,
47+
'array_syntax' => ['syntax' => 'short'],
48+
'binary_operator_spaces' => [
49+
'align_double_arrow' => true,
50+
'align_equals' => true,
51+
]
2452
))
25-
->finder($finder);
53+
->setFinder($finder);

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ php:
66
- '5.6'
77
- '7.0'
88
- '7.1'
9+
- '7.2'
910
- hhvm
1011
- nightly
1112

1213
matrix:
1314
fast_finish: true
1415
allow_failures:
1516
- php: 5.4
17+
- php: 5.5
1618

1719
env:
1820
global:

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
[![PHP 5.6](https://img.shields.io/badge/php-5.6-8892BF.svg?style=flat-square)](https://php.net/)
1010
[![PHP 7](https://img.shields.io/badge/php-7-8892BF.svg?style=flat-square)](https://php.net/)
1111
[![PHP 7.1](https://img.shields.io/badge/php-7.1-8892BF.svg?style=flat-square)](https://php.net/)
12+
[![PHP 7.2](https://img.shields.io/badge/php-7.2-8892BF.svg?style=flat-square)](https://php.net/)
1213

1314
# BigBlueButton API for PHP
1415

@@ -18,6 +19,8 @@ The official and easy to use **BigBlueButton API for PHP**, makes easy for devel
1819

1920
- PHP 5.4 or above.
2021
- Curl library installed.
22+
- mbstring library installed.
23+
- Xml library installed.
2124

2225
BigBlueButton API for PHP is also tested to work with HHVM and fully compatible with PHP 7.1.
2326

@@ -194,10 +197,10 @@ Bugs and feature request are tracked on [GitHub](https://github.com/bigbluebutto
194197
Make sure the code style configuration is applied by running PHPCS-Fixer.
195198

196199
```
197-
./vendor/bin/php-cs-fixer fix
200+
./vendor/bin/php-cs-fixer fix --allow-risky yes
198201
```
199202

200-
### Runing tests
203+
### Running tests
201204

202205
For every implemented feature add unit tests and check all is green by running the command below.
203206

composer.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,14 @@
2727
"ext-curl": "*"
2828
},
2929
"require-dev": {
30-
"composer/composer": "1.0.*@dev",
31-
"phpunit/phpunit": "4.1.*",
32-
"fzaninotto/faker": "~1.5.0",
33-
"friendsofphp/php-cs-fixer": "~1.10",
34-
"squizlabs/php_codesniffer": "2.*",
35-
"satooshi/php-coveralls": "1.*"
30+
"php": ">=7.0",
31+
"ext-mbstring": "*",
32+
"composer/composer": "1.7.*@dev",
33+
"phpunit/phpunit": "7.1.*",
34+
"fzaninotto/faker": "~1.7.1",
35+
"friendsofphp/php-cs-fixer": "~2.11",
36+
"squizlabs/php_codesniffer": "3.*",
37+
"satooshi/php-coveralls": "2.*"
3638
},
3739
"autoload": {
3840
"psr-4": {

src/BigBlueButton.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22
/**
3-
* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
3+
* BigBlueButton open source conferencing system - https://www.bigbluebutton.org/.
44
*
5-
* Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
5+
* Copyright (c) 2016-2018 BigBlueButton Inc. and by respective authors (see below).
66
*
77
* This program is free software; you can redistribute it and/or modify it under the
88
* terms of the GNU Lesser General Public License as published by the Free Software

src/Core/ApiMethod.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22
/**
3-
* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
3+
* BigBlueButton open source conferencing system - https://www.bigbluebutton.org/.
44
*
5-
* Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
5+
* Copyright (c) 2016-2018 BigBlueButton Inc. and by respective authors (see below).
66
*
77
* This program is free software; you can redistribute it and/or modify it under the
88
* terms of the GNU Lesser General Public License as published by the Free Software

src/Core/Attendee.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22
/**
3-
* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
3+
* BigBlueButton open source conferencing system - https://www.bigbluebutton.org/.
44
*
5-
* Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
5+
* Copyright (c) 2016-2018 BigBlueButton Inc. and by respective authors (see below).
66
*
77
* This program is free software; you can redistribute it and/or modify it under the
88
* terms of the GNU Lesser General Public License as published by the Free Software

src/Core/Meeting.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

33
/**
4-
* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
4+
* BigBlueButton open source conferencing system - https://www.bigbluebutton.org/.
55
*
6-
* Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
6+
* Copyright (c) 2016-2018 BigBlueButton Inc. and by respective authors (see below).
77
*
88
* This program is free software; you can redistribute it and/or modify it under the
99
* terms of the GNU Lesser General Public License as published by the Free Software
@@ -17,7 +17,6 @@
1717
* You should have received a copy of the GNU Lesser General Public License along
1818
* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
1919
*/
20-
2120
namespace BigBlueButton\Core;
2221

2322
/**

src/Core/MeetingInfo.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22
/**
3-
* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
3+
* BigBlueButton open source conferencing system - https://www.bigbluebutton.org/.
44
*
5-
* Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
5+
* Copyright (c) 2016-2018 BigBlueButton Inc. and by respective authors (see below).
66
*
77
* This program is free software; you can redistribute it and/or modify it under the
88
* terms of the GNU Lesser General Public License as published by the Free Software

src/Core/Record.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22
/**
3-
* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
3+
* BigBlueButton open source conferencing system - https://www.bigbluebutton.org/.
44
*
5-
* Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
5+
* Copyright (c) 2016-2018 BigBlueButton Inc. and by respective authors (see below).
66
*
77
* This program is free software; you can redistribute it and/or modify it under the
88
* terms of the GNU Lesser General Public License as published by the Free Software

0 commit comments

Comments
 (0)