Skip to content

Commit 77733e7

Browse files
committed
Merge branch 'master' into text-tracks
# Conflicts: # src/BigBlueButton.php # src/Core/ApiMethod.php # src/Parameters/GetRecordingTextTracksParameters.php # src/Responses/GetRecordingTextTracksResponse.php # tests/Parameters/GetRecordingTextTracksParametersTest.php
2 parents 4c041ef + 291a588 commit 77733e7

File tree

110 files changed

+4365
-1278
lines changed

Some content is hidden

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

110 files changed

+4365
-1278
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
composer.phar
22
/vendor/
33
composer.lock
4+
.DS_Store
45

56
## Directory-based project format:
67
.idea/
78
/nbproject
89

910
# PHP CS Fixer cache file
10-
.php_cs.cache
11+
.php-cs-fixer.cache
12+
13+
.phpunit.result.cache

.php-cs-fixer.php

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
$header = <<<'EOF'
6+
BigBlueButton open source conferencing system - https://www.bigbluebutton.org/.
7+
8+
Copyright (c) 2016-2023 BigBlueButton Inc. and by respective authors (see below).
9+
10+
This program is free software; you can redistribute it and/or modify it under the
11+
terms of the GNU Lesser General Public License as published by the Free Software
12+
Foundation; either version 3.0 of the License, or (at your option) any later
13+
version.
14+
15+
BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
16+
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
17+
PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
18+
19+
You should have received a copy of the GNU Lesser General Public License along
20+
with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
21+
EOF;
22+
23+
$finder = PhpCsFixer\Finder::create()
24+
->files()
25+
->name(['*.php'])
26+
->in(__DIR__ . '/src')
27+
->in(__DIR__ . '/tests');
28+
29+
$config = new PhpCsFixer\Config();
30+
$config
31+
->setRiskyAllowed(true)
32+
->setRules([
33+
'@PhpCsFixer' => true,
34+
'@PHP74Migration' => true,
35+
'general_phpdoc_annotation_remove' => ['annotations' => ['expectedDeprecation']], // one should use PHPUnit built-in method instead
36+
'header_comment' => ['header' => $header],
37+
'concat_space' => ['spacing' => 'one'],
38+
'function_declaration' => ['closure_function_spacing' => 'none'],
39+
'constant_case' => ['case' => 'lower'],
40+
'single_quote' => true,
41+
'mb_str_functions' => true,
42+
'array_syntax' => ['syntax' => 'short'],
43+
'binary_operator_spaces' => ['operators' =>
44+
['=>' => 'align_single_space_minimal', '=' => 'align_single_space_minimal']
45+
],
46+
])
47+
->setFinder($finder);
48+
49+
return $config;

.php_cs

Lines changed: 0 additions & 53 deletions
This file was deleted.

.scrutinizer.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
build:
2+
nodes:
3+
analysis:
4+
project_setup:
5+
override: true
6+
environment:
7+
php:
8+
version: 8.1
9+
compile_options: '--with-openssl --with-curl --enable-mbstring --enable-mbregex --enable-bcmath --with-mhash --with-xmlrpc --enable-opcache --enable-intl --with-pear --enable-fpm --with-zlib-dir --enable-inline-optimization --with-bz2 --with-zlib'
10+
tests:
11+
override:
12+
- php-scrutinizer-run --enable-security-analysis
13+
filter:
14+
excluded_paths:
15+
- 'tests/*'
16+
checks:
17+
php:
18+
uppercase_constants: true
19+
remove_extra_empty_lines: true
20+
function_in_camel_caps: true
21+
avoid_fixme_comments: true
22+
avoid_todo_comments: true
23+
24+
coding_style:
25+
php:
26+
indentation:
27+
general:
28+
size: 1
29+
spaces:
30+
around_operators:
31+
concatenation: false

.travis.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

README.md

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
# BigBlueButton API for PHP
22

33
![Home Image](https://raw.githubusercontent.com/wiki/bigbluebutton/bigbluebutton-api-php/images/header.png)
4+
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fbigbluebutton%2Fbigbluebutton-api-php.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fbigbluebutton%2Fbigbluebutton-api-php?ref=badge_shield)
45

5-
The official and easy to use **BigBlueButton API for PHP**, makes easy for developers to use [BigBlueButton][bbb] API for **PHP 5.4+**.
6+
The official and easy to use **BigBlueButton API for PHP**, makes easy for developers to use [BigBlueButton][bbb] API for **PHP 7.3+**.
67

78
![Packagist](https://img.shields.io/packagist/v/bigbluebutton/bigbluebutton-api-php.svg?label=release)
89
![PHP from Travis config](https://img.shields.io/travis/php-v/bigbluebutton/bigbluebutton-api-php.svg)
910
[![Downloads](https://img.shields.io/packagist/dt/bigbluebutton/bigbluebutton-api-php.svg?style=flat-square)](https://packagist.org/packages/bigbluebutton/bigbluebutton-api-php)
1011

11-
[![Build Status](https://travis-ci.org/bigbluebutton/bigbluebutton-api-php.svg?branch=master)](https://travis-ci.org/bigbluebutton/bigbluebutton-api-php)
12-
[![Coverage Status](https://coveralls.io/repos/github/bigbluebutton/bigbluebutton-api-php/badge.svg?branch=master)](https://coveralls.io/github/bigbluebutton/bigbluebutton-api-php?branch=master)
12+
[![Build Status](https://scrutinizer-ci.com/g/bigbluebutton/bigbluebutton-api-php/badges/build.png?b=master)](https://scrutinizer-ci.com/g/bigbluebutton/bigbluebutton-api-php/build-status/master)
13+
[![Code Coverage](https://scrutinizer-ci.com/g/bigbluebutton/bigbluebutton-api-php/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/bigbluebutton/bigbluebutton-api-php/?branch=master)
1314
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/bigbluebutton/bigbluebutton-api-php/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/bigbluebutton/bigbluebutton-api-php/?branch=master)
1415

1516
[![@bigbluebutton on Twitter](https://img.shields.io/badge/twitter-%40bigbluebutton-blue.svg?style=flat)](https://twitter.com/bigbluebutton)
1617
![Website](https://img.shields.io/website-up-down-green-red/http/bigbluebutton.org.svg?label=BigBlueButton.org)
1718

18-
[![PHP 5.5](https://img.shields.io/badge/php-5.5-f33.svg?style=flat-square)](https://php.net/)
19-
[![PHP 5.6](https://img.shields.io/badge/php-5.6-f33.svg?style=flat-square)](https://php.net/)
20-
[![PHP 7.0](https://img.shields.io/badge/php-7.0-f33.svg?style=flat-square)](https://php.net/)
21-
[![PHP 7.1](https://img.shields.io/badge/php-7.1-f93.svg?style=flat-square)](https://php.net/)
22-
[![PHP 7.2](https://img.shields.io/badge/php-7.2-9c9.svg?style=flat-square)](https://php.net/)
23-
[![PHP 7.3](https://img.shields.io/badge/php-7.3-9c9.svg?style=flat-square)](https://php.net/)
19+
[![PHP 7.3](https://img.shields.io/badge/php-7.3-f33.svg?style=flat-square)](https://www.php.net/supported-versions.php)
20+
[![PHP 7.4](https://img.shields.io/badge/php-7.4-f33.svg?style=flat-square)](https://www.php.net/supported-versions.php)
21+
[![PHP 8.0](https://img.shields.io/badge/php-8.0-f93.svg?style=flat-square)](https://www.php.net/supported-versions.php)
22+
[![PHP 8.1](https://img.shields.io/badge/php-8.1-9c9.svg?style=flat-square)](https://www.php.net/supported-versions.php)
23+
[![PHP 8.2](https://img.shields.io/badge/php-8.2-9c9.svg?style=flat-square)](https://www.php.net/supported-versions.php)
2424

2525
## Installation and usage
2626

@@ -37,18 +37,27 @@ Bugs and feature request are tracked on [GitHub](https://github.com/bigbluebutto
3737
Make sure the code style configuration is applied by running PHPCS-Fixer.
3838

3939
```
40-
./vendor/bin/php-cs-fixer fix --allow-risky yes
40+
composer cs-fix
4141
```
4242

4343
### Running tests
4444

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

47+
```bash
48+
composer test
4749
```
48-
./vendor/bin/phpunit
50+
51+
To run a single test
52+
53+
```bash
54+
./vendor/bin/phpunit --filter "BigBlueButtonTest::testApiVersion"
4955
```
5056

5157
[bbb]: http://bigbluebutton.org
5258
[composer]: https://getcomposer.org
5359
[INSTALL]: samples/README.md
54-
[wiki]: https://github.com/bigbluebutton/bigbluebutton-api-php/wiki
60+
[wiki]: https://github.com/bigbluebutton/bigbluebutton-api-php/wiki
61+
62+
## License
63+
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fbigbluebutton%2Fbigbluebutton-api-php.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fbigbluebutton%2Fbigbluebutton-api-php?ref=badge_large)

composer.json

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"api"
99
],
1010
"homepage": "http://bigbluebutton.org/",
11-
"license": "GPL-3.0",
11+
"license": "LGPL-3.0-or-later",
1212
"authors": [
1313
{
1414
"name": "Ghazi Triki",
15-
"email": "ghazi.[email protected]",
15+
"email": "ghazi.[email protected]",
1616
"role": "Developer"
1717
}
1818
],
@@ -23,24 +23,53 @@
2323
}
2424
},
2525
"require": {
26-
"php": ">=5.4",
26+
"php": ">=7.1",
2727
"ext-curl": "*",
2828
"ext-simplexml": "*",
29-
"ext-mbstring": "*"
29+
"ext-mbstring": "*",
30+
"marc-mabe/php-enum": "^4.7"
3031
},
3132
"require-dev": {
32-
"php": ">=7.0",
33-
"ext-mbstring": "*",
34-
"composer/composer": "1.7.*@dev",
35-
"phpunit/phpunit": "6.*",
36-
"fzaninotto/faker": "~1.8.0",
37-
"friendsofphp/php-cs-fixer": "2.*",
38-
"squizlabs/php_codesniffer": "3.*",
39-
"php-coveralls/php-coveralls": "2.1.*"
33+
"phpunit/phpunit": "^9.5",
34+
"fakerphp/faker": "^1.21",
35+
"friendsofphp/php-cs-fixer": "^3.13.2",
36+
"squizlabs/php_codesniffer": "^3.7.1",
37+
"phploc/phploc": "^7.0.2",
38+
"nunomaduro/phpinsights": "^v2.6.1",
39+
"bmitch/churn-php": "^1.7.1",
40+
"phpmetrics/phpmetrics": "^v2.8",
41+
"wapmorgan/php-deprecation-detector": "^2.0"
42+
},
43+
"scripts": {
44+
"test": "./vendor/bin/phpunit",
45+
"test-cov": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-html coverage",
46+
"cs-fix": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --allow-risky yes",
47+
"sniffer": "./vendor/bin/phpcs src/",
48+
"phploc": "./vendor/bin/phploc src/",
49+
"phpinsights": "./vendor/bin/phpinsights",
50+
"phpdd": "./vendor/bin/phpdd --target 7.4 src/",
51+
"phpmetrics": "./vendor/bin/phpmetrics --report-html=metrics src/",
52+
"churn": "./vendor/bin/churn run src/"
53+
},
54+
"options": {
55+
"symlink": false
4056
},
4157
"autoload": {
4258
"psr-4": {
4359
"BigBlueButton\\": "src"
4460
}
61+
},
62+
"autoload-dev": {
63+
"psr-4": {
64+
"BigBlueButton\\": [
65+
"src",
66+
"tests"
67+
]
68+
}
69+
},
70+
"config": {
71+
"allow-plugins": {
72+
"dealerdirect/phpcodesniffer-composer-installer": true
73+
}
4574
}
4675
}

phpunit.xml.dist

Lines changed: 18 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
4-
<phpunit backupGlobals="false"
5-
backupStaticAttributes="false"
6-
bootstrap="./tests/bootstrap.php"
7-
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
13-
syntaxCheck="false">
14-
15-
<php>
16-
<!-- Specify the value of your BigBlueButton secret -->
17-
<env name="BBB_SECRET" value="8cd8ef52e8e101574e400365b55e11a6"/>
18-
<!-- Specify the Server Base URL of your BigBlueButton -->
19-
<env name="BBB_SERVER_BASE_URL" value="https://test-install.blindsidenetworks.com/bigbluebutton/"/>
20-
</php>
21-
22-
<log type="coverage-html" target="./coverage"
23-
charset='UTF-8' yui='true'/>
24-
25-
<filter>
26-
<whitelist processUncoveredFilesFromWhitelist="true">
27-
<directory suffix=".php">./src/</directory>
28-
</whitelist>
29-
</filter>
30-
31-
<testsuites>
32-
<testsuite name="BigBlueButton test suit">
33-
<directory>./tests/</directory>
34-
</testsuite>
35-
</testsuites>
36-
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="./tests/bootstrap.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
3+
<coverage processUncoveredFiles="true">
4+
<include>
5+
<directory suffix=".php">./src/</directory>
6+
</include>
7+
</coverage>
8+
<php>
9+
<env name="XDEBUG_MODE" value="coverage"/>
10+
<!-- Specify the value of your BigBlueButton secret -->
11+
<env name="BBB_SECRET" value="8cd8ef52e8e101574e400365b55e11a6"/>
12+
<!-- Specify the Server Base URL of your BigBlueButton -->
13+
<env name="BBB_SERVER_BASE_URL" value="https://test-install.blindsidenetworks.com/bigbluebutton/"/>
14+
</php>
15+
<testsuites>
16+
<testsuite name="BigBlueButton test suite">
17+
<directory>./tests/</directory>
18+
</testsuite>
19+
</testsuites>
3720
</phpunit>

0 commit comments

Comments
 (0)