Skip to content
This repository has been archived by the owner on Jul 12, 2022. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: herpaderpaldent/seat-groups
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.7.1
Choose a base ref
...
head repository: herpaderpaldent/seat-groups
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 13 commits
  • 12 files changed
  • 2 contributors

Commits on Mar 24, 2019

  1. Feature/seat notifications/2.0.0 (#93)

    * Introduce SeatGroupSyncNotification for SeatNotification 2.0
    
    * Remove unneeded blade resources
    
    * create abstract class
    
    * add group class
    
    * remove php storm creation comment
    
    * Missing Refresh Token for seat-notification 2.0
    
    * SeAT Group Application Notification for SeAT-Notifications 2.0
    
    * SeAT Group Error Notification
    
    * Added permissions to permission check
    
    * remove unneeded routes
    
    * Changelog and version bump
    
    * Apply fixes from StyleCI
    herpaderpaldent authored Mar 24, 2019
    Copy the full SHA
    9342777 View commit details
  2. Copy the full SHA
    c75a255 View commit details

Commits on Mar 28, 2019

  1. Copy the full SHA
    baaf354 View commit details
  2. Copy the full SHA
    a86b557 View commit details
  3. Copy the full SHA
    7c56397 View commit details
  4. Release/1.7.0 (#96)

    * Apply fixes from StyleCI (#94)
    
    * correctly assert recipients group instead of the applicant ones.
    
    * Implement `dontSend()` for Sync, Error
    
    * Apply fixes from StyleCI (#97)
    herpaderpaldent authored Mar 28, 2019
    Copy the full SHA
    a9b3bd5 View commit details

Commits on Mar 31, 2019

  1. Copy the full SHA
    4560b7c View commit details
  2. Copy the full SHA
    2d5aee2 View commit details

Commits on Apr 10, 2019

  1. Merge remote-tracking branch 'origin/master' into develop

    # Conflicts:
    #	CHANGELOG.md
    #	src/Notifications/SeatGroupApplication/AbstractSeatGroupApplicationNotification.php
    #	src/config/seatgroups.config.php
    herpaderpaldent committed Apr 10, 2019
    Copy the full SHA
    4088f0d View commit details

Commits on Jun 6, 2019

  1. Copy the full SHA
    0867c25 View commit details

Commits on Jun 7, 2019

  1. Add Vagrant files for dev

    Felix Huber committed Jun 7, 2019
    Copy the full SHA
    19a46a3 View commit details

Commits on Jun 8, 2019

  1. Fix php7.3 controller issue (#113)

    * Try to get view testing going ...
    
    * Complete view-test and include #112
    
    * Version bump and changelog update
    herpaderpaldent authored Jun 8, 2019
    Copy the full SHA
    22ea6db View commit details
  2. Merge pull request #114 from herpaderpaldent/develop

    # Version 1.7.2
    Fix an issue with `SeatGroupsController` where an unused variable blocked the edit-view to be loaded.
    herpaderpaldent authored Jun 8, 2019
    Copy the full SHA
    8be64c7 View commit details
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Version 1.7.2
Fix an issue with `SeatGroupsController` where an unused variable blocked the edit-view to be loaded.

# Version 1.7.1
This new version has two main purposes:
1. introduce testing
20 changes: 20 additions & 0 deletions Homestead.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
ip: 192.168.10.10
memory: 2048
cpus: 2
provider: virtualbox
authorize: ~/.ssh/id_rsa.pub
keys:
- ~/.ssh/id_rsa
folders:
-
map: /Users/fehu/PhpstormProjects/seat-groups
to: /home/vagrant/code
sites:
- map: homestead.test
to: /home/vagrant/code/public
- map: redis
to: /home/vagrant/code/public
databases:
- homestead
name: seat-groups
hostname: seat-groups
53 changes: 53 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :

require 'json'
require 'yaml'

VAGRANTFILE_API_VERSION ||= "2"
confDir = $confDir ||= File.expand_path("vendor/laravel/homestead", File.dirname(__FILE__))

homesteadYamlPath = File.expand_path("Homestead.yaml", File.dirname(__FILE__))
homesteadJsonPath = File.expand_path("Homestead.json", File.dirname(__FILE__))
afterScriptPath = "after.sh"
customizationScriptPath = "user-customizations.sh"
aliasesPath = "aliases"

require File.expand_path(confDir + '/scripts/homestead.rb')

Vagrant.require_version '>= 1.9.0'

Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
if File.exist? aliasesPath then
config.vm.provision "file", source: aliasesPath, destination: "/tmp/bash_aliases"
config.vm.provision "shell" do |s|
s.inline = "awk '{ sub(\"\r$\", \"\"); print }' /tmp/bash_aliases > /home/vagrant/.bash_aliases"
end
end

if File.exist? homesteadYamlPath then
settings = YAML::load(File.read(homesteadYamlPath))
elsif File.exist? homesteadJsonPath then
settings = JSON::parse(File.read(homesteadJsonPath))
else
abort "Homestead settings file not found in " + File.dirname(__FILE__)
end

Homestead.configure(config, settings)

if File.exist? afterScriptPath then
config.vm.provision "shell", path: afterScriptPath, privileged: false, keep_color: true
end

if File.exist? customizationScriptPath then
config.vm.provision "shell", path: customizationScriptPath, privileged: false, keep_color: true
end

if Vagrant.has_plugin?('vagrant-hostsupdater')
config.hostsupdater.aliases = settings['sites'].map { |site| site['map'] }
elsif Vagrant.has_plugin?('vagrant-hostmanager')
config.hostmanager.enabled = true
config.hostmanager.manage_host = true
config.hostmanager.aliases = settings['sites'].map { |site| site['map'] }
end
end
9 changes: 9 additions & 0 deletions after.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh

# If you would like to do some extra provisioning you may
# add any commands you wish to this file and they will
# be run after the Homestead machine is provisioned.
#
# If you have user-specific configurations you would like
# to apply, you may also create user-customizations.sh,
# which will be run after this script.
264 changes: 264 additions & 0 deletions aliases
Original file line number Diff line number Diff line change
@@ -0,0 +1,264 @@
alias ..="cd .."
alias ...="cd ../.."

alias h='cd ~'
alias c='clear'
alias art=artisan

alias phpspec='vendor/bin/phpspec'
alias phpunit='vendor/bin/phpunit'
alias serve=serve-laravel

alias xoff='sudo phpdismod -s cli xdebug'
alias xon='sudo phpenmod -s cli xdebug'

function artisan() {
php artisan "$@"
}

function dusk() {
pids=$(pidof /usr/bin/Xvfb)

if [ ! -n "$pids" ]; then
Xvfb :0 -screen 0 1280x960x24 &
fi

php artisan dusk "$@"
}

function php71() {
sudo update-alternatives --set php /usr/bin/php7.1
sudo update-alternatives --set php-config /usr/bin/php-config7.1
sudo update-alternatives --set phpize /usr/bin/phpize7.1
}

function php72() {
sudo update-alternatives --set php /usr/bin/php7.2
sudo update-alternatives --set php-config /usr/bin/php-config7.2
sudo update-alternatives --set phpize /usr/bin/phpize7.2
}

function php73() {
sudo update-alternatives --set php /usr/bin/php7.3
sudo update-alternatives --set php-config /usr/bin/php-config7.3
sudo update-alternatives --set phpize /usr/bin/phpize7.3
}

function serve-apache() {
if [[ "$1" && "$2" ]]
then
sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1"
sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/serve-apache.sh
sudo bash /vagrant/vendor/laravel/homestead/scripts/serve-apache.sh "$1" "$2" 80 443 "${3:-7.1}"
else
echo "Error: missing required parameters."
echo "Usage: "
echo " serve-apache domain path"
fi
}

function serve-laravel() {
if [[ "$1" && "$2" ]]
then
sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1"
sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/serve-laravel.sh
sudo bash /vagrant/vendor/laravel/homestead/scripts/serve-laravel.sh "$1" "$2" 80 443 "${3:-7.1}"
else
echo "Error: missing required parameters."
echo "Usage: "
echo " serve domain path"
fi
}

function serve-proxy() {
if [[ "$1" && "$2" ]]
then
sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/serve-proxy.sh
sudo bash /vagrant/vendor/laravel/homestead/scripts/serve-proxy.sh "$1" "$2" 80 443 "${3:-7.1}"
else
echo "Error: missing required parameters."
echo "Usage: "
echo " serve-proxy domain port"
fi
}

function serve-silverstripe() {
if [[ "$1" && "$2" ]]
then
sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1"
sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/serve-silverstripe.sh
sudo bash /vagrant/vendor/laravel/homestead/scripts/serve-silverstripe.sh "$1" "$2" 80 443 "${3:-7.1}"
else
echo "Error: missing required parameters."
echo "Usage: "
echo " serve-silverstripe domain path"
fi
}

function serve-spa() {
if [[ "$1" && "$2" ]]
then
sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1"
sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/serve-spa.sh
sudo bash /vagrant/vendor/laravel/homestead/scripts/serve-spa.sh "$1" "$2" 80 443 "${3:-7.1}"
else
echo "Error: missing required parameters."
echo "Usage: "
echo " serve-spa domain path"
fi
}

function serve-statamic() {
if [[ "$1" && "$2" ]]
then
sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1"
sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/serve-statamic.sh
sudo bash /vagrant/vendor/laravel/homestead/scripts/serve-statamic.sh "$1" "$2" 80 443 "${3:-7.1}"
else
echo "Error: missing required parameters."
echo "Usage: "
echo " serve-statamic domain path"
fi
}

function serve-symfony2() {
if [[ "$1" && "$2" ]]
then
sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1"
sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/serve-symfony2.sh
sudo bash /vagrant/vendor/laravel/homestead/scripts/serve-symfony2.sh "$1" "$2" 80 443 "${3:-7.1}"
else
echo "Error: missing required parameters."
echo "Usage: "
echo " serve-symfony2 domain path"
fi
}

function serve-symfony4() {
if [[ "$1" && "$2" ]]
then
sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1"
sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/serve-symfony4.sh
sudo bash /vagrant/vendor/laravel/homestead/scripts/serve-symfony4.sh "$1" "$2" 80 443 "${3:-7.1}"
else
echo "Error: missing required parameters."
echo "Usage: "
echo " serve-symfony4 domain path"
fi
}

function serve-pimcore() {
if [[ "$1" && "$2" ]]
then
sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1"
sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/serve-pimcore.sh
sudo bash /vagrant/vendor/laravel/homestead/scripts/serve-pimcore.sh "$1" "$2" 80 443 "${3:-7.1}"
else
echo "Error: missing required parameters."
echo "Usage: "
echo " serve-pimcore domain path"
fi
}

function share() {
if [[ "$1" ]]
then
ngrok http ${@:2} -host-header="$1" 80
else
echo "Error: missing required parameters."
echo "Usage: "
echo " share domain"
echo "Invocation with extra params passed directly to ngrok"
echo " share domain -region=eu -subdomain=test1234"
fi
}

function flip() {
sudo bash /vagrant/vendor/laravel/homestead/scripts/flip-webserver.sh
}

function __has_pv() {
$(hash pv 2>/dev/null);

return $?
}

function __pv_install_message() {
if ! __has_pv; then
echo $1
echo "Install pv with \`sudo apt-get install -y pv\` then run this command again."
echo ""
fi
}

function dbexport() {
FILE=${1:-/vagrant/mysqldump.sql.gz}

# This gives an estimate of the size of the SQL file
# It appears that 80% is a good approximation of
# the ratio of estimated size to actual size
SIZE_QUERY="select ceil(sum(data_length) * 0.8) as size from information_schema.TABLES"

__pv_install_message "Want to see export progress?"

echo "Exporting databases to '$FILE'"

if __has_pv; then
ADJUSTED_SIZE=$(mysql --vertical -uhomestead -psecret -e "$SIZE_QUERY" 2>/dev/null | grep 'size' | awk '{print $2}')
HUMAN_READABLE_SIZE=$(numfmt --to=iec-i --suffix=B --format="%.3f" $ADJUSTED_SIZE)

echo "Estimated uncompressed size: $HUMAN_READABLE_SIZE"
mysqldump -uhomestead -psecret --all-databases --skip-lock-tables --routines 2>/dev/null | pv --size=$ADJUSTED_SIZE | gzip > "$FILE"
else
mysqldump -uhomestead -psecret --all-databases --skip-lock-tables --routines 2>/dev/null | gzip > "$FILE"
fi

echo "Done."
}

function dbimport() {
FILE=${1:-/vagrant/mysqldump.sql.gz}

__pv_install_message "Want to see import progress?"

echo "Importing databases from '$FILE'"

if __has_pv; then
pv "$FILE" --progress --eta | zcat | mysql -uhomestead -psecret 2>/dev/null
else
cat "$FILE" | zcat | mysql -uhomestead -psecret 2>/dev/null
fi

echo "Done."
}

function xphp() {
(php -m | grep -q xdebug)
if [[ $? -eq 0 ]]
then
XDEBUG_ENABLED=true
else
XDEBUG_ENABLED=false
fi

if ! $XDEBUG_ENABLED; then xon; fi

php \
-dxdebug.remote_host=192.168.10.1 \
-dxdebug.remote_autostart=1 \
"$@"

if ! $XDEBUG_ENABLED; then xoff; fi
}

function update-socket-wrench() {
cd /var/www/socket-wrench
git pull origin release
composer install
php artisan migrate --force
}

function seed-socket-wrench() {
cd /var/www/socket-wrench
php artisan db:seed
}
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -12,7 +12,8 @@
"orchestra/database" : "~3.5",
"phpunit/phpunit": "~6.0",
"spatie/phpunit-watcher": "^1.8",
"codeclimate/php-test-reporter": "^0.4.4"
"codeclimate/php-test-reporter": "^0.4.4",
"laravel/homestead": "^8.5"
},
"conflict": {
"herpaderpaldent/seat-notifications": "<2.0.0"
Loading