Skip to content

Commit

Permalink
Update to PHP 7.4 (#2)
Browse files Browse the repository at this point in the history
* Update .gitignore

* Delete composer.lock

* Update dependencies

* Update PHPunit configuration file

* Add psalm configuration file

* Update phpunit.xml

* Add github actions

* Add github templates

* Update to PHP 7.4
  • Loading branch information
dvdheiden authored Sep 12, 2021
1 parent 08c2ae9 commit 42ca172
Show file tree
Hide file tree
Showing 22 changed files with 209 additions and 3,265 deletions.
28 changes: 28 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
name: Bug report
about: Create a report to help us improve
title: ""
labels: bug
assignees: vdhicts

---

## Describe the bug

A clear and concise description of what the bug is.

## Reproduction

Steps to reproduce the behavior.

## Expected behavior

A clear and concise description of what you expected to happen.

## Actual behavior

Describe the behavior as it is right now.

## Additional information

Anything else you want to provide.
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
name: Feature request
about: Suggest an idea for this project
title: ""
labels: feature
assignees: vdhicts

---

## Goal

A clear and concise description of what the problem is. Ex. I think this could be easier when...

## Additional information

Add any other context or screenshots about the feature request here.
3 changes: 3 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Changes

Provide a summary of your changes.
29 changes: 29 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Cluster API

on: [push]

jobs:
cluster-api-tests:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v1

- name: Setup PHP
uses: shivammathur/setup-php@v1
with:
php-version: '7.4'
extensions: mbstring, intl

- name: Install Dependencies
run: composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress

- name: Execute tests (Unit and Feature tests) via PHPUnit
run: |
vendor/bin/phpunit
- name: Execute static analysis
run: |
vendor/bin/psalm
155 changes: 5 additions & 150 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,150 +1,5 @@
# Based on https://github.com/github/gitignore/tree/master/Global

################################################################################
#
# Ignore all dot-files and dot-folders, except .htaccess and .gitignore
#
################################################################################
.*
!/.gitignore
!/.htaccess

################################################################################
#
# JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion
#
################################################################################
*.iml
.idea/

## File-based project format:
*.ipr
*.iws

# Plugin-specific files:

# IntelliJ
/out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties

################################################################################
#
# Netbeans
#
################################################################################

nbproject/
build/
nbbuild/
dist/
nbdist/
nbactions.xml
nb-configuration.xml
.nb-gradle/

################################################################################
#
# Windows OS
#
################################################################################

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk

################################################################################
#
# Notepad++
#
################################################################################

*.bak

################################################################################
#
# Vagrant
#
################################################################################

.vagrant/

################################################################################
#
# TortoiseGit
#
################################################################################

# Project-level settings
/.tgitconfig

################################################################################
#
# NodeJS
#
################################################################################

# Logs
logs
*.log

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directory
# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
node_modules

################################################################################
#
# Composer
#
################################################################################

composer.phar
vendor/

# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
# composer.lock
composer.lock
/vendor/
/.idea/
/build/
.phpunit.result.cache
17 changes: 8 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ Easily use the [API](https://developers.rebrandly.com/) of the url shortener [Re

## Requirements

This packages requires PHP 7.2+.
This packages requires PHP 7.4+.

## Installation

This package can be used in any PHP project or with any framework. The packages is tested in PHP 7.0.
This package can be used in any PHP project or with any framework. The packages is tested in PHP 7.4.

You can install the package via composer:

Expand Down Expand Up @@ -53,7 +53,7 @@ $links = $rebrandly->links()->list(new Options(['orderBy' => 'clicks', 'orderDir

### Models

This client will always return the related nideks. When creating a new resource, the object is provided to the `create`
This client will always return the related models. When creating a new resource, the object is provided to the `create`
method. For example, to create a link:

```php
Expand Down Expand Up @@ -96,7 +96,7 @@ $client = new Rebrandly\Client(config('rebrandly.api_key'));

## Tests

Uunit tests are available in the `tests` folder. Run via phpunit:
Unit tests are available in the `tests` folder. Run via phpunit:

`vendor\bin\phpunit`

Expand All @@ -109,8 +109,8 @@ exchange you will be credited as contributor on this page.

## Security

If you discover any security related issues in this or other packages of Vdhicts, please email info@vdhicts.nl instead
of using the issue tracker.
If you discover any security related issues in this or other packages of Vdhicts, please email security@vdhicts.nl
instead of using the issue tracker.

## License

Expand All @@ -123,6 +123,5 @@ problem with this client, please open an issue on GitHub.

## About vdhicts

[Van der Heiden ICT services](https://www.vdhicts.nl) is the name of my personal company for which I work as
freelancer. Van der Heiden ICT services develops and implements IT solutions for businesses and educational
institutions.
[Vdhicts](https://www.vdhicts.nl) is the name of my personal company. Vdhicts develops and implements IT solutions for
businesses and educational institutions.
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@
}
],
"require": {
"php": "^7.2",
"php": "^7.4",
"ext-json": "*",
"guzzlehttp/guzzle": "^6.5",
"guzzlehttp/guzzle": "^7.0",
"nesbot/carbon": "^2.31"
},
"require-dev": {
"phpunit/phpunit": "^8.5"
"phpunit/phpunit": "^9.0",
"vimeo/psalm": "^4.10"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 42ca172

Please sign in to comment.